summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new62
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch21
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch154
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch14
-rw-r--r--recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch13
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/build-hacks.patch)48
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-libtoolize.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg.patch)0
-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.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/fix_hotspot_crosscompile.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-corba-parallel-make.patch)4
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch)290
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-fix-xrender.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-dlvsym-uclibc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isfinte.patch)0
-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.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-loadavg.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-remove-unused-backtrace.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-unpack-uclibc.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-launcher-stdc++.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch188
-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.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-shark-arm-linux-cpu-detection.patch)0
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-unbreak-float.patch)6
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch (renamed from recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch)17
-rw-r--r--recipes-core/openjdk/openjdk-7-25b30/jvm.cfg (renamed from recipes-core/openjdk/openjdk-7-03b21/jvm.cfg)0
-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.inc (renamed from recipes-core/openjdk/openjdk-7-release-03b21.inc)43
-rw-r--r--recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb36
-rw-r--r--recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb36
41 files changed, 572 insertions, 550 deletions
diff --git a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
deleted file mode 100644
index 5987ccf..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea-2.1.8/Makefile.am
2===================================================================
3--- icedtea-2.1.8.orig/Makefile.am 2013-05-03 15:58:48.434381989 +0200
4+++ icedtea-2.1.8/Makefile.am 2013-05-03 15:59:28.495766246 +0200
5@@ -18,7 +18,7 @@
6 JAXWS_SHA256SUM = 1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d
7 JDK_SHA256SUM = bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf
8 LANGTOOLS_SHA256SUM = 46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6
9-OPENJDK_SHA256SUM = 6cb4258bf22daba0dd5b8cbfee8acd8a378b3e1f36259b6437f7589c74ed6e4f
10+OPENJDK_SHA256SUM = 19018c45d97cecd9c753a6fc4b52af57cc93b65e3ee303c0750a7961171d5f3d
11
12 CACAO_VERSION = a567bcb7f589
13 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new b/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
deleted file mode 100644
index c14d378..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch.new
+++ /dev/null
@@ -1,62 +0,0 @@
1diff --git a/jdk/make/sun/awt/mawt.gmk b/jdk/make/sun/awt/mawt.gmk
2index 45e8349..ed452ba 100644
3--- a/jdk/make/sun/awt/mawt.gmk
4+++ b/jdk/make/sun/awt/mawt.gmk
5@@ -151,22 +151,6 @@ else
6 #endif
7
8 LIBXTST = -lXtst
9-ifeq ($(PLATFORM), linux)
10- ifeq ($(ARCH_DATA_MODEL), 64)
11- # XXX what about the rest of them?
12- LIBXT = -lXt
13- else
14- # Allows for builds on Debian GNU Linux, X11 is in a different place
15- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
16- $(wildcard /usr/lib/libXt.a))
17- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
18- $(wildcard /usr/lib/libSM.a))
19- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
20- $(wildcard /usr/lib/libICE.a))
21- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
22- $(wildcard /usr/lib/libXtst.a))
23- endif
24-endif
25
26 # Use -lXmu for EditRes support
27 LIBXMU_DBG = -lXmu
28@@ -181,7 +165,7 @@ ifeq ($(PLATFORM), linux)
29 OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
30 # XXX what is this define below? Isn't it motif-related?
31 OTHER_CFLAGS += -DXMSTRINGDEFINES=1
32-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
33+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
34 endif
35
36 endif
37@@ -230,12 +214,6 @@ else
38 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
39 endif
40
41-ifndef HEADLESS
42-CPPFLAGS += -I$(OPENWIN_HOME)/include
43-LDFLAGS += -L$(OPENWIN_LIB)
44-
45-endif # !HEADLESS
46-
47 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
48 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
49 -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
50@@ -258,12 +236,6 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
51 -I$(PLATFORM_SRC)/native/$(PKGDIR) \
52 $(EVENT_MODEL)
53
54-ifeq ($(PLATFORM), linux)
55- # Checking for the X11/extensions headers at the additional location
56- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
57- $(wildcard /usr/include/X11/extensions))
58-endif
59-
60 ifeq ($(PLATFORM), solaris)
61 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
62 endif
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch
deleted file mode 100644
index 5f2c98b..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hostbuildcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/rules.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100
4+++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100
5@@ -39,6 +39,7 @@
6 # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
7 C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
8 CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
9+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS)
10
11 AS.S = $(AS) $(ASFLAGS)
12
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch
deleted file mode 100644
index 494e965..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isnanf.patch
+++ /dev/null
@@ -1,21 +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:47:12.695674808 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200
5@@ -220,14 +220,14 @@
6 // checking for nanness
7 #ifdef SOLARIS
8 #ifdef SPARC
9-inline int g_isnan(float f) { return isnanf(f); }
10+inline int g_isnan(float f) { return __isnanf(f); }
11 #else
12 // isnanf() broken on Intel Solaris use isnand()
13 inline int g_isnan(float f) { return isnand(f); }
14 #endif
15 inline int g_isnan(double f) { return isnand(f); }
16 #elif LINUX
17-inline int g_isnan(float f) { return isnanf(f); }
18+inline int g_isnan(float f) { return __isnanf(f); }
19 inline int g_isnan(double f) { return isnan(f); }
20 #else
21 #error "missing platform-specific definition here"
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch
deleted file mode 100644
index f590577..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-libnet-renaming.patch
+++ /dev/null
@@ -1,154 +0,0 @@
1Index: openjdk/jdk/make/java/net/Makefile
2===================================================================
3--- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200
4+++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200
5@@ -25,7 +25,7 @@
6
7 BUILDDIR = ../..
8 PACKAGE = java.net
9-LIBRARY = net
10+LIBRARY = javanet
11 PRODUCT = sun
12 include $(BUILDDIR)/common/Defs.gmk
13
14Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
15===================================================================
16--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200
17+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200
18@@ -58,7 +58,7 @@
19 */
20 static {
21 java.security.AccessController.doPrivileged(
22- new sun.security.action.LoadLibraryAction("net"));
23+ new sun.security.action.LoadLibraryAction("javanet"));
24 }
25
26 /**
27Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
28===================================================================
29--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200
30+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200
31@@ -74,7 +74,7 @@
32 */
33 static {
34 java.security.AccessController.doPrivileged(
35- new sun.security.action.LoadLibraryAction("net"));
36+ new sun.security.action.LoadLibraryAction("javanet"));
37 }
38
39 /**
40Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
41===================================================================
42--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200
43+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200
44@@ -47,7 +47,7 @@
45 */
46 static {
47 java.security.AccessController.doPrivileged(
48- new sun.security.action.LoadLibraryAction("net"));
49+ new sun.security.action.LoadLibraryAction("javanet"));
50 init();
51 }
52
53Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java
54===================================================================
55--- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200
56+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200
57@@ -230,7 +230,7 @@
58 static {
59 preferIPv6Address = java.security.AccessController.doPrivileged(
60 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
61- AccessController.doPrivileged(new LoadLibraryAction("net"));
62+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
63 init();
64 }
65
66Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
67===================================================================
68--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200
69+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200
70@@ -52,7 +52,7 @@
71 private boolean virtual = false;
72
73 static {
74- AccessController.doPrivileged(new LoadLibraryAction("net"));
75+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
76 init();
77 }
78
79Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
80===================================================================
81--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200
82+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200
83@@ -89,7 +89,7 @@
84 }});
85 if (b != null && b.booleanValue()) {
86 java.security.AccessController.doPrivileged(
87- new sun.security.action.LoadLibraryAction("net"));
88+ new sun.security.action.LoadLibraryAction("javanet"));
89 hasSystemProxies = init();
90 }
91 }
92Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/share/classes/sun/nio/ch/Util.java
93===================================================================
94--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200
95+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200
96@@ -354,7 +354,7 @@
97 return;
98 loaded = true;
99 java.security.AccessController
100- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
101+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
102 java.security.AccessController
103 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
104 // IOUtil must be initialized; Its native methods are called from
105Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
106===================================================================
107--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200
108+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200
109@@ -244,7 +244,7 @@
110
111 static {
112 java.security.AccessController.doPrivileged(
113- new sun.security.action.LoadLibraryAction("net"));
114+ new sun.security.action.LoadLibraryAction("javanet"));
115 }
116
117 }
118Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
119===================================================================
120--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200
121+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200
122@@ -160,7 +160,7 @@
123
124 static {
125 java.security.AccessController.doPrivileged(
126- new sun.security.action.LoadLibraryAction("net"));
127+ new sun.security.action.LoadLibraryAction("javanet"));
128 init0();
129
130 // start the address listener thread
131--- openjdk/jdk/make/java/nio/Makefile
132+++ openjdk/jdk/make/java/nio/Makefile
133@@ -282,7 +282,7 @@ ifeq ($(PLATFORM),windows)
134 endif
135
136 ifeq ($(PLATFORM), linux)
137-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
138+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
139 ifdef USE_SYSTEM_GIO
140 OTHER_LDLIBS += $(GIO_LIBS)
141 OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
142diff --git openjdk/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
143index e71a92b..e94b1e1 100644
144--- openjdk/jdk/make/com/sun/nio/sctp/Makefile
145+++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
146@@ -62,7 +62,7 @@ OTHER_INCLUDES += \
147 ifeq ($(PLATFORM), linux)
148 COMPILER_WARNINGS_FATAL=true
149 #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
150-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
151+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
152 endif
153 ifeq ($(PLATFORM), solaris)
154 #LIBSCTP = -lsctp
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch
deleted file mode 100644
index be5ad85..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_sparc_compiler_option.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/jdk/make/common/shared/Compiler-gcc.gmk
2===================================================================
3--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-26 14:43:49.342875981 +0200
4+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-26 15:21:25.514903711 +0200
5@@ -133,7 +133,7 @@
6 REQUIRED_GCC_VER = 4.0.*
7 endif
8 # Option used to create a shared library
9- SHARED_LIBRARY_FLAG = -shared -mimpure-text
10+ SHARED_LIBRARY_FLAG = -shared
11 SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
12
13 endif
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch
deleted file mode 100644
index f2ad035..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-remove_werror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/gcc.make
2===================================================================
3--- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100
4+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100
5@@ -98,9 +98,6 @@
6 CFLAGS += -pipe
7 endif
8
9-# Compiler warnings are treated as errors
10-WARNINGS_ARE_ERRORS = -Werror
11-
12 # Except for a few acceptable ones
13 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
14 # conversions which might affect the values. To avoid that, we need to turn
diff --git a/recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch b/recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch
deleted file mode 100644
index 9040304..0000000
--- a/recipes-core/openjdk/openjdk-7-03b21/jamvm-extract.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea-2.1/Makefile.am
2===================================================================
3--- icedtea-2.1.orig/Makefile.am
4+++ icedtea-2.1/Makefile.am
5@@ -1210,7 +1210,7 @@ endif
6 clean-extract-cacao: clean-cacao
7 rm -f stamps/extract-cacao.stamp
8
9-stamps/extract-jamvm.stamp:
10+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
11 if BUILD_JAMVM
12 set -e ; \
13 if ! test -d jamvm ; \
diff --git a/recipes-core/openjdk/openjdk-7-03b21/build-hacks.patch b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
index d6776ae..5eccc68 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/build-hacks.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/build-hacks.patch
@@ -1,8 +1,8 @@
1Index: icedtea-2.1/Makefile.am 1Index: icedtea-2.3.12/Makefile.am
2=================================================================== 2===================================================================
3--- icedtea-2.1.orig/Makefile.am 3--- icedtea-2.3.12.orig/Makefile.am 2013-07-26 18:17:45.499466367 +0000
4+++ icedtea-2.1/Makefile.am 4+++ icedtea-2.3.12/Makefile.am 2013-07-30 21:04:46.761410713 +0000
5@@ -416,6 +416,12 @@ ICEDTEA_ENV = \ 5@@ -471,6 +471,12 @@
6 JAVAC="" \ 6 JAVAC="" \
7 JAVA_HOME="" \ 7 JAVA_HOME="" \
8 JDK_HOME="" \ 8 JDK_HOME="" \
@@ -15,38 +15,20 @@ Index: icedtea-2.1/Makefile.am
15 QUIETLY="" \ 15 QUIETLY="" \
16 ANT_RESPECT_JAVA_HOME="TRUE" \ 16 ANT_RESPECT_JAVA_HOME="TRUE" \
17 DISTRIBUTION_ID="$(DIST_ID)" \ 17 DISTRIBUTION_ID="$(DIST_ID)" \
18@@ -1923,12 +1929,16 @@ clean-rewrite-rhino: 18@@ -2028,7 +2034,11 @@
19 stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
20 if BUILD_JAMVM 19 if BUILD_JAMVM
21 cd jamvm/jamvm && \ 20 cd jamvm/jamvm && \
22- ./autogen.sh --with-java-runtime-library=openjdk \ 21 ./autogen.sh --with-java-runtime-library=openjdk7 \
23- --prefix=$(abs_top_builddir)/jamvm/install ; \ 22- --prefix=$(abs_top_builddir)/jamvm/install ; \
24- $(MAKE) ; \ 23+ --prefix=$(abs_top_builddir)/jamvm/install \
25- $(MAKE) install
26+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \
27+ --prefix=/usr/lib \
28+ --host=$(host_alias) \ 24+ --host=$(host_alias) \
29+ --build=$(build_alias) \ 25+ --build=$(build_alias) \
30+ --target=$(target_alias) \ 26+ --target=$(target_alias) \
31+ --with-libtool-sysroot ; \ 27+ --with-libtool-sysroot ; \
32+ $(ARCH_PREFIX) $(MAKE) ; \ 28 $(MAKE) ; \
33+ $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install 29 $(MAKE) install
34 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server 30 mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
35- cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server 31@@ -2093,6 +2103,7 @@
36+ cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
37 ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
38 touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
39 ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so
40@@ -1945,7 +1955,7 @@ clean-jamvm:
41 stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
42 if ADD_JAMVM_BUILD
43 mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
44- install -m 644 jamvm/install/lib/libjvm.so \
45+ install -m 644 jamvm/install/usr/lib/lib/libjvm.so \
46 $(BUILD_JRE_ARCH_DIR)/jamvm/
47 printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
48 else
49@@ -1989,6 +1999,7 @@ if !USE_SYSTEM_CACAO
50 --host=$(host_alias) \ 32 --host=$(host_alias) \
51 --build=$(build_alias) \ 33 --build=$(build_alias) \
52 --target=$(target_alias) \ 34 --target=$(target_alias) \
@@ -54,7 +36,7 @@ Index: icedtea-2.1/Makefile.am
54 --prefix=$(abs_top_builddir)/cacao/install \ 36 --prefix=$(abs_top_builddir)/cacao/install \
55 --with-java-runtime-library=openjdk7 \ 37 --with-java-runtime-library=openjdk7 \
56 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ 38 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
57@@ -2056,7 +2067,7 @@ clean-add-cacao-debug: 39@@ -2160,7 +2171,7 @@
58 # configure script arguments, quoted in single quotes 40 # configure script arguments, quoted in single quotes
59 CONFIGURE_ARGS = @CONFIGURE_ARGS@ 41 CONFIGURE_ARGS = @CONFIGURE_ARGS@
60 ADD_ZERO_CONFIGURE_ARGS = \ 42 ADD_ZERO_CONFIGURE_ARGS = \
@@ -63,11 +45,11 @@ Index: icedtea-2.1/Makefile.am
63 --disable-bootstrap --enable-zero 45 --disable-bootstrap --enable-zero
64 if ADD_SHARK_BUILD 46 if ADD_SHARK_BUILD
65 ADD_ZERO_CONFIGURE_ARGS += \ 47 ADD_ZERO_CONFIGURE_ARGS += \
66Index: icedtea-2.1/javac.in 48Index: icedtea-2.3.12/javac.in
67=================================================================== 49===================================================================
68--- icedtea-2.1.orig/javac.in 50--- icedtea-2.3.12.orig/javac.in 2013-07-24 21:33:57.224612327 +0000
69+++ icedtea-2.1/javac.in 51+++ icedtea-2.3.12/javac.in 2013-07-30 19:41:56.240277496 +0000
70@@ -70,5 +70,7 @@ else 52@@ -77,5 +77,7 @@
71 my @CLASSPATH = ('@ECJ_JAR@'); 53 my @CLASSPATH = ('@ECJ_JAR@');
72 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; 54 push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
73 $ENV{"CLASSPATH"} = join ':', @CLASSPATH; 55 $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch
index c21fcf1..c21fcf1 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-arm-ucontext.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-arm-ucontext.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch
index 484cb10..484cb10 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-libtoolize.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-libtoolize.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch
index 81ac590..81ac590 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg-makefile.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg-makefile.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch
index 0fc1a81..0fc1a81 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/cacao-loadavg.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-loadavg.patch
diff --git a/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch b/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch
new file mode 100644
index 0000000..cd6cdbf
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/cacao-update.patch
@@ -0,0 +1,63 @@
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
new file mode 100644
index 0000000..bb05b3b
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/fix-checksums.patch
@@ -0,0 +1,13 @@
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-03b21/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch
index 8d2d045..8d2d045 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/fix_hotspot_crosscompile.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/fix_hotspot_crosscompile.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-corba-parallel-make.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch
index 09f7511..3e2893c 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-corba-parallel-make.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-corba-parallel-make.patch
@@ -1,5 +1,5 @@
1diff --git openjdk/corba/make/Makefile openjdk/corba/make/Makefile 1diff --git openjdk/corba/make/Makefile openjdk/corba/make/Makefile
2index aef5c1b..62e2216 100644 2index d81c66c..4f750e8 100644
3--- openjdk/corba/make/Makefile 3--- openjdk/corba/make/Makefile
4+++ openjdk/corba/make/Makefile 4+++ openjdk/corba/make/Makefile
5@@ -134,7 +134,7 @@ default: all 5@@ -134,7 +134,7 @@ default: all
@@ -20,7 +20,7 @@ index aef5c1b..62e2216 100644
20 ( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \ 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 -@ ) ; 21 ( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ;
22@@ -153,7 +154,8 @@ $(SRC_ZIP): $(SRC_ZIP_FILES) 22@@ -153,7 +154,8 @@ $(SRC_ZIP): $(SRC_ZIP_FILES)
23 BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl 23 BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
24 24
25 BIN_ZIP = $(LIB_DIR)/bin.zip 25 BIN_ZIP = $(LIB_DIR)/bin.zip
26-$(BIN_ZIP): $(BIN_ZIP_FILES) 26-$(BIN_ZIP): $(BIN_ZIP_FILES)
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch
index 9099d4c..39436a5 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-crosscompile-fix.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-crosscompile-fix.patch
@@ -1,17 +1,50 @@
1--- openjdk/hotspot/make/linux/makefiles/buildtree.make 1diff --git openjdk/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
2+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2index fb575fa..e0426ad 100644
3@@ -402,7 +402,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java 3--- openjdk/corba/make/common/shared/Platform.gmk
4 echo "rm -f Queens.class"; \ 4+++ openjdk/corba/make/common/shared/Platform.gmk
5 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ 5@@ -152,9 +152,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
6 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ 6 OS_NAME = linux
7- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ 7 OS_VERSION := $(shell uname -r)
8+ echo 'echo Silently skipping the execution of the gamma program'; \ 8 # Arch and OS name/version
9 ) > $@ 9- mach := $(shell uname -m)
10 $(QUIETLY) chmod +x $@ 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
11 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
12--- openjdk/hotspot/make/linux/makefiles/gcc.make 45--- openjdk/hotspot/make/linux/makefiles/gcc.make
13+++ openjdk/hotspot/make/linux/makefiles/gcc.make 46+++ openjdk/hotspot/make/linux/makefiles/gcc.make
14@@ -160,7 +160,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) 47@@ -164,7 +164,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
15 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 48 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
16 49
17 # The flags to use for an Optimized g++ build 50 # The flags to use for an Optimized g++ build
@@ -20,7 +53,7 @@
20 53
21 # Hotspot uses very unstrict aliasing turn this optimization off 54 # Hotspot uses very unstrict aliasing turn this optimization off
22 OPT_CFLAGS += -fno-strict-aliasing 55 OPT_CFLAGS += -fno-strict-aliasing
23@@ -204,15 +204,7 @@ LFLAGS += -Wl,-relax 56@@ -208,15 +208,7 @@ LFLAGS += -Wl,-relax
24 endif 57 endif
25 58
26 # Enable linker optimization 59 # Enable linker optimization
@@ -37,6 +70,8 @@
37 70
38 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. 71 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
39 MAPFLAG = -Xlinker --version-script=FILENAME 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
40--- openjdk/hotspot/make/linux/makefiles/launcher.make 75--- openjdk/hotspot/make/linux/makefiles/launcher.make
41+++ openjdk/hotspot/make/linux/makefiles/launcher.make 76+++ openjdk/hotspot/make/linux/makefiles/launcher.make
42@@ -50,8 +50,8 @@ ifeq ($(LINK_INTO),AOUT) 77@@ -50,8 +50,8 @@ ifeq ($(LINK_INTO),AOUT)
@@ -49,21 +84,25 @@
49+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ 84+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
50 endif 85 endif
51 86
52 LINK_LAUNCHER = $(LINK.c) 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
53--- openjdk/hotspot/make/linux/makefiles/vm.make 90--- openjdk/hotspot/make/linux/makefiles/vm.make
54+++ openjdk/hotspot/make/linux/makefiles/vm.make 91+++ openjdk/hotspot/make/linux/makefiles/vm.make
55@@ -272,6 +272,7 @@ ifeq ($(SHARK_BUILD), true) 92@@ -292,6 +292,7 @@ ifeq ($(SHARK_BUILD), true)
56 LIBS_VM += $(LLVM_LIBS) 93 LIBS_VM += $(LLVM_LIBS)
57 endif 94 endif
58 95
59+LFLAGS_VM += $(OE_LDFLAGS) 96+LFLAGS_VM += $(OE_LDFLAGS)
60 LINK_VM = $(LINK_LIB.c) 97 LINK_VM = $(LINK_LIB.CC)
61 98
62 # rule for building precompiled header 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
63--- openjdk/jdk/make/common/Defs-linux.gmk 102--- openjdk/jdk/make/common/Defs-linux.gmk
64+++ openjdk/jdk/make/common/Defs-linux.gmk 103+++ openjdk/jdk/make/common/Defs-linux.gmk
65@@ -125,35 +125,13 @@ else 104@@ -165,35 +165,13 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
66 endif 105 endif
67 endif 106 endif
68 107
69-# 108-#
@@ -99,8 +138,8 @@
99 CFLAGS_REQUIRED_hppa += 138 CFLAGS_REQUIRED_hppa +=
100 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN 139 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
101 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN 140 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
102@@ -232,7 +210,7 @@ ifeq ($(DEBUG_BINARIES), true) 141@@ -283,7 +261,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
103 CFLAGS_REQUIRED += $(DEBUG_FLAG) 142 endif
104 endif 143 endif
105 144
106-CFLAGS_OPT = $(CC_OPT) 145-CFLAGS_OPT = $(CC_OPT)
@@ -108,7 +147,7 @@
108 CFLAGS_DBG = $(DEBUG_FLAG) 147 CFLAGS_DBG = $(DEBUG_FLAG)
109 CFLAGS_COMMON += $(CFLAGS_REQUIRED) 148 CFLAGS_COMMON += $(CFLAGS_REQUIRED)
110 149
111@@ -308,7 +286,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) 150@@ -359,7 +337,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
112 # 151 #
113 # -L paths for finding and -ljava 152 # -L paths for finding and -ljava
114 # 153 #
@@ -117,89 +156,8 @@
117 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) 156 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
118 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) 157 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
119 158
120--- openjdk/jdk/make/sun/awt/mawt.gmk
121+++ openjdk/jdk/make/sun/awt/mawt.gmk
122@@ -151,22 +151,6 @@ else
123 #endif
124
125 LIBXTST = -lXtst
126-ifeq ($(PLATFORM), linux)
127- ifeq ($(ARCH_DATA_MODEL), 64)
128- # XXX what about the rest of them?
129- LIBXT = -lXt
130- else
131- # Allows for builds on Debian GNU Linux, X11 is in a different place
132- LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \
133- $(wildcard /usr/lib/libXt.a))
134- LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \
135- $(wildcard /usr/lib/libSM.a))
136- LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \
137- $(wildcard /usr/lib/libICE.a))
138- LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \
139- $(wildcard /usr/lib/libXtst.a))
140- endif
141-endif
142
143 # Use -lXmu for EditRes support
144 LIBXMU_DBG = -lXmu
145@@ -181,7 +165,7 @@ ifeq ($(PLATFORM), linux)
146 OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
147 # XXX what is this define below? Isn't it motif-related?
148 OTHER_CFLAGS += -DXMSTRINGDEFINES=1
149-OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
150+OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext -lXt -lSM -lICE -lXi -lX11
151 endif
152
153 endif
154@@ -230,12 +214,6 @@ else
155 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/fontconfig2
156 endif
157
158-ifndef HEADLESS
159-CPPFLAGS += -I$(OPENWIN_HOME)/include
160-LDFLAGS += -L$(OPENWIN_LIB)
161-
162-endif # !HEADLESS
163-
164 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
165 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
166 -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
167@@ -258,12 +236,6 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
168 -I$(PLATFORM_SRC)/native/$(PKGDIR) \
169 $(EVENT_MODEL)
170
171-ifeq ($(PLATFORM), linux)
172- # Checking for the X11/extensions headers at the additional location
173- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
174- $(wildcard /usr/include/X11/extensions))
175-endif
176-
177 ifeq ($(PLATFORM), solaris)
178 CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
179 endif
180diff --git openjdk/corba/make/common/shared/Platform.gmk openjdk/corba/make/common/shared/Platform.gmk
181index e21f4d0..5f071a7 100644
182--- openjdk/corba/make/common/shared/Platform.gmk
183+++ openjdk/corba/make/common/shared/Platform.gmk
184@@ -152,9 +152,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
185 OS_NAME = linux
186 OS_VERSION := $(shell uname -r)
187 # Arch and OS name/version
188- mach := $(shell uname -m)
189- ifneq (,$(wildcard /usr/bin/dpkg-architecture))
190- mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
191+ ifdef CROSS_COMPILE_ARCH
192+ mach := $(CROSS_COMPILE_ARCH)
193+ else
194+ mach := $(shell uname -m)
195+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
196+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
197+ endif
198 endif
199 archExpr = case "$(mach)" in \
200 i[3-9]86) \
201diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk 159diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
202index 5b21888..3b9297f 100644 160index c23e96e..484afca 100644
203--- openjdk/jdk/make/common/shared/Platform.gmk 161--- openjdk/jdk/make/common/shared/Platform.gmk
204+++ openjdk/jdk/make/common/shared/Platform.gmk 162+++ openjdk/jdk/make/common/shared/Platform.gmk
205@@ -159,9 +159,9 @@ ifeq ($(SYSTEM_UNAME), Linux) 163@@ -159,9 +159,9 @@ ifeq ($(SYSTEM_UNAME), Linux)
@@ -215,32 +173,11 @@ index 5b21888..3b9297f 100644
215 endif 173 endif
216 archExpr = case "$(mach)" in \ 174 archExpr = case "$(mach)" in \
217 i[3-9]86) \ 175 i[3-9]86) \
218diff --git openjdk/hotspot/make/linux/makefiles/build_vm_def.sh openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
219index ea81ff6..6a3765b 100644
220--- openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
221+++ openjdk/hotspot/make/linux/makefiles/build_vm_def.sh
222@@ -1,10 +1,12 @@
223 #!/bin/sh
224
225 # If we're cross compiling use that path for nm
226-if [ "$CROSS_COMPILE_ARCH" != "" ]; then
227-NM=$ALT_COMPILER_PATH/nm
228-else
229-NM=nm
230+if [ "$NM" == "" ]; then
231+ if [ "$CROSS_COMPILE_ARCH" != "" ]; then
232+ NM=$ALT_COMPILER_PATH/nm
233+ else
234+ NM=nm
235+ fi
236 fi
237
238 $NM --defined-only $* \
239diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile 176diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
240index 8130b9b..7906531 100644 177index cd336a2..1e5f8e5 100644
241--- openjdk/jdk/make/java/nio/Makefile 178--- openjdk/jdk/make/java/nio/Makefile
242+++ openjdk/jdk/make/java/nio/Makefile 179+++ openjdk/jdk/make/java/nio/Makefile
243@@ -834,8 +834,12 @@ else 180@@ -934,8 +934,12 @@ else
244 $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE) 181 $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
245 $(prep-target) 182 $(prep-target)
246 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@ 183 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
@@ -253,7 +190,7 @@ index 8130b9b..7906531 100644
253 # 190 #
254 # Generated sun.nio.cs SingleByte classes 191 # Generated sun.nio.cs SingleByte classes
255 # 192 #
256@@ -869,8 +873,12 @@ else 193@@ -969,8 +973,12 @@ else
257 $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE) 194 $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE)
258 $(prep-target) 195 $(prep-target)
259 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@ 196 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@
@@ -266,7 +203,7 @@ index 8130b9b..7906531 100644
266 203
267 GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c 204 GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
268 205
269@@ -891,7 +899,11 @@ else 206@@ -991,7 +999,11 @@ else
270 $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE) 207 $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE)
271 $(prep-target) 208 $(prep-target)
272 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@ 209 NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@
@@ -278,11 +215,73 @@ index 8130b9b..7906531 100644
278+endif 215+endif
279 216
280 .PHONY: sources 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
281diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile 280diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile
282index e7d54e2..ce8819c 100644 281index 53d31f3..183c063 100644
283--- openjdk/jdk/make/sun/xawt/Makefile 282--- openjdk/jdk/make/sun/xawt/Makefile
284+++ openjdk/jdk/make/sun/xawt/Makefile 283+++ openjdk/jdk/make/sun/xawt/Makefile
285@@ -188,20 +188,6 @@ else 284@@ -198,20 +198,6 @@ else
286 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2 285 CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2
287 endif 286 endif
288 287
@@ -303,19 +302,36 @@ index e7d54e2..ce8819c 100644
303 # We have some odd logic here because some Solaris 10 updates 302 # We have some odd logic here because some Solaris 10 updates
304 # have a render.h file that suggests gradients are supported, but 303 # have a render.h file that suggests gradients are supported, but
305 # the Xrender.h doesn't have the corresponding type definitions. 304 # the Xrender.h doesn't have the corresponding type definitions.
306@@ -312,11 +298,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt 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,11 +317,7 @@ 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
307 325
308 $(SIZERS): $(SIZERS_C)
309 $(prep-target)
310-ifndef CROSS_COMPILE_ARCH 326-ifndef CROSS_COMPILE_ARCH
311 $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c 327 SIZERS_CC = $(CC)
312-else 328-else
313- $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c 329-SIZERS_CC = $(HOST_CC)
314-endif 330-endif
315 331
316 $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) 332 $(SIZERS): $(SIZERS_C)
317 $(prep-target) 333 $(prep-target)
318@@ -329,6 +311,16 @@ $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) 334@@ -358,6 +334,16 @@ $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
319 $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) 335 $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
320 336
321 $(SIZES): $(SIZERS) 337 $(SIZES): $(SIZERS)
@@ -332,7 +348,7 @@ index e7d54e2..ce8819c 100644
332 @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ 348 @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
333 $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ 349 $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
334 $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ 350 $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
335@@ -337,6 +329,7 @@ $(SIZES): $(SIZERS) 351@@ -366,6 +352,7 @@ $(SIZES): $(SIZERS)
336 $(ECHO) GENERATING $@; \ 352 $(ECHO) GENERATING $@; \
337 $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ 353 $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
338 fi 354 fi
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-fix-xrender.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch
index 4bd8b2c..4bd8b2c 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-fix-xrender.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-fix-xrender.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-dlvsym-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch
index 657f722..657f722 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-dlvsym-uclibc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-dlvsym-uclibc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch
index faa90ea..faa90ea 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-glibc-version.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch
index 7c5da59..7c5da59 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-isfinte.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isfinte.patch
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch
new file mode 100644
index 0000000..b2ddfa9
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-isnanf.patch
@@ -0,0 +1,13 @@
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-03b21/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
index 7da41fd..7da41fd 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-loadavg.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-hotspot-loadavg.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch
index 68f8581..68f8581 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-iconv-uclibc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-iconv-uclibc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch
index 6b14673..6b14673 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch
index cc5e4e8..cc5e4e8 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-powerpc-atomic64.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch
index 5bb7604..5bb7604 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-ppc64-jvm-cfg.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch
index 5423fde..5423fde 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-remove-unused-backtrace.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-remove-unused-backtrace.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch
index 7e98767..7e98767 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-unpack-uclibc.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-unpack-uclibc.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch
index b97745d..b97745d 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-launcher-stdc++.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-launcher-stdc++.patch
diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch
new file mode 100644
index 0000000..d6a599c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-libnet-renaming.patch
@@ -0,0 +1,188 @@
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-remove_werror.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-remove_werror.patch
new file mode 100644
index 0000000..f78f2b3
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/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-03b21/icedtea-shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch
index f40bc51..f40bc51 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-shark-arm-linux-cpu-detection.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-shark-arm-linux-cpu-detection.patch
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch
index b5219da..c03b23c 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-unbreak-float.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unbreak-float.patch
@@ -1,7 +1,9 @@
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
1--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 3--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
2+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 4+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
3@@ -26,13 +26,11 @@ 5@@ -32,13 +32,11 @@
4 6 #endif
5 #include "jfdlibm.h" 7 #include "jfdlibm.h"
6 8
7-#ifdef __NEWVALID /* special setup for Sun test regime */ 9-#ifdef __NEWVALID /* special setup for Sun test regime */
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch
index a63506b..83dba2b 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/icedtea-zero-hotspotfix.patch
+++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-zero-hotspotfix.patch
@@ -1,12 +1,13 @@
1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make b/hotspot/make/linux/makefiles/zeroshark.make 1diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
2index 4cf1826..4c0105b 100644 2index c2a1484..156bdd0 100644
3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make 3--- openjdk/hotspot/make/linux/makefiles/zeroshark.make
4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 4+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
5@@ -32,26 +32,27 @@ Obj_Files += cppInterpreter_arm.o 5@@ -32,26 +32,28 @@ Obj_Files += cppInterpreter_arm.o
6 Obj_Files += thumb2.o 6 Obj_Files += thumb2.o
7 7
8 CFLAGS += -DHOTSPOT_ASM 8 CFLAGS += -DHOTSPOT_ASM
9+CCFLAGS += -DHOTSPOT_ASM 9+CCFLAGS += -DHOTSPOT_ASM
10+
10 11
11 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s 12 cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s
12 thumb2.o: offsets_arm.s 13 thumb2.o: offsets_arm.s
@@ -17,9 +18,9 @@ index 4cf1826..4c0105b 100644
17+ $(QEMU) ./mkoffsets > $@ 18+ $(QEMU) ./mkoffsets > $@
18 19
19 bytecodes_arm.s: bytecodes_arm.def mkbc 20 bytecodes_arm.s: bytecodes_arm.def mkbc
20 @echo Generatine ARM assembler bytecode sequences 21 @echo Generating ARM assembler bytecode sequences
21- $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) 22- $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
22+ $(CC_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE) 23+ $(CC_COMPILE) $(CFLAGS) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE)
23 24
24 mkbc: $(GAMMADIR)/tools/mkbc.c 25 mkbc: $(GAMMADIR)/tools/mkbc.c
25 @echo Compiling mkbc tool 26 @echo Compiling mkbc tool
@@ -29,8 +30,8 @@ index 4cf1826..4c0105b 100644
29 mkoffsets: asm_helper.cpp 30 mkoffsets: asm_helper.cpp
30 @echo Compiling offset generator 31 @echo Compiling offset generator
31 $(QUIETLY) $(REMOVE_TARGET) 32 $(QUIETLY) $(REMOVE_TARGET)
32- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) 33- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
33+ $(CC_COMPILE) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) 34+ $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -static -o $@ $< $(COMPILE_DONE)
34 35
35 endif 36 endif
36 37
diff --git a/recipes-core/openjdk/openjdk-7-03b21/jvm.cfg b/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg
index ea97cda..ea97cda 100644
--- a/recipes-core/openjdk/openjdk-7-03b21/jvm.cfg
+++ b/recipes-core/openjdk/openjdk-7-25b30/jvm.cfg
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
new file mode 100644
index 0000000..00b9660
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-25b30/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-release-03b21.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
index 07b1f7a..363b6e2 100644
--- a/recipes-core/openjdk/openjdk-7-release-03b21.inc
+++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
@@ -2,7 +2,7 @@ require openjdk-7-common.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4 4
5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b21:" 5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-25b30:"
6 6
7# Name of the directory containing the compiled output 7# Name of the directory containing the compiled output
8BUILD_DIR = "openjdk.build" 8BUILD_DIR = "openjdk.build"
@@ -13,50 +13,29 @@ ARM_INSTRUCTION_SET_armv4t = "ARM"
13 13
14ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced" 14ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced"
15 15
16ICEDTEA_PREFIX = "icedtea7-forest-2.1" 16ICEDTEA_PREFIX = "icedtea7-forest-2.3"
17ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}" 17ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}"
18 18
19OPENJDK_CHANGESET = "22cc03983e20"
20OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" 19OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2"
21OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false" 20OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false"
22SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb"
23SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e"
24 21
25HOTSPOT_CHANGESET = "0e651e004747"
26HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz" 22HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz"
27HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" 23HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false"
28SRC_URI[hotspot.md5sum] = "edd627c8781161eb33006ed668d833e0"
29SRC_URI[hotspot.sha256sum] = "d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1"
30 24
31CORBA_CHANGESET = "5617f6c5cc94"
32CORBA_FILE = "${CORBA_CHANGESET}.tar.gz" 25CORBA_FILE = "${CORBA_CHANGESET}.tar.gz"
33CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" 26CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false"
34SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251"
35SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3"
36 27
37JAXP_CHANGESET = "1cf75c0e2c96"
38JAXP_FILE = "${JAXP_CHANGESET}.tar.gz" 28JAXP_FILE = "${JAXP_CHANGESET}.tar.gz"
39JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" 29JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false"
40SRC_URI[jaxp.md5sum] = "56e609548b322149cb84604f232a4602"
41SRC_URI[jaxp.sha256sum] = "8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e"
42 30
43JAXWS_CHANGESET = "7edfbfe974f2"
44JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz" 31JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz"
45JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" 32JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false"
46SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac"
47SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa"
48 33
49JDK_CHANGESET = "50f6f276a06c"
50JDK_FILE = "${JDK_CHANGESET}.tar.gz" 34JDK_FILE = "${JDK_CHANGESET}.tar.gz"
51JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" 35JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false"
52SRC_URI[jdk.md5sum] = "7ee77eeeff600c5a4763b4ac76fd62bc"
53SRC_URI[jdk.sha256sum] = "5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d"
54 36
55LANGTOOLS_CHANGESET = "b534c4c6cd9b"
56LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz" 37LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz"
57LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" 38LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false"
58SRC_URI[langtools.md5sum] = "16b72f3fea8ac4e5b50de693e87f9c53"
59SRC_URI[langtools.sha256sum] = "c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c"
60 39
61CACAO_VERSION = "a567bcb7f589" 40CACAO_VERSION = "a567bcb7f589"
62CACAO_FILE = "${CACAO_VERSION}.tar.gz" 41CACAO_FILE = "${CACAO_VERSION}.tar.gz"
@@ -64,7 +43,7 @@ CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};nam
64SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73" 43SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73"
65SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9" 44SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9"
66 45
67JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d" 46JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
68JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz" 47JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
69JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false" 48JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
70SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b" 49SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
@@ -76,20 +55,26 @@ OEPATCHES = "\
76 file://cacao-libtoolize.patch \ 55 file://cacao-libtoolize.patch \
77 file://cacao-loadavg-makefile.patch \ 56 file://cacao-loadavg-makefile.patch \
78 file://fix_hotspot_crosscompile.patch \ 57 file://fix_hotspot_crosscompile.patch \
79 file://fix-checksums.patch \ 58 file://cacao-update.patch \
80 file://jamvm-extract.patch \
81 file://cacao-loadavg.patch;apply=no \ 59 file://cacao-loadavg.patch;apply=no \
82 file://cacao-arm-ucontext.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 \
83 " 63 "
84 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
85# Allow overriding this separately 72# Allow overriding this separately
86ICEDTEAPATCHES = "\ 73ICEDTEAPATCHES = "\
87 file://icedtea-crosscompile-fix.patch;apply=no \ 74 file://icedtea-crosscompile-fix.patch;apply=no \
88 file://icedtea-hostbuildcc.patch;apply=no \
89 file://icedtea-unbreak-float.patch;apply=no \ 75 file://icedtea-unbreak-float.patch;apply=no \
90 file://icedtea-remove_werror.patch;apply=no \ 76 file://icedtea-remove_werror.patch;apply=no \
91 file://icedtea-libnet-renaming.patch;apply=no \ 77 file://icedtea-libnet-renaming.patch;apply=no \
92 file://icedtea-fix-xrender.patch;apply=no \
93 file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ 78 file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \
94 file://icedtea-corba-parallel-make.patch;apply=no \ 79 file://icedtea-corba-parallel-make.patch;apply=no \
95 file://icedtea-zero-hotspotfix.patch;apply=no \ 80 file://icedtea-zero-hotspotfix.patch;apply=no \
@@ -117,11 +102,9 @@ ICEDTEAPATCHES_append_libc-uclibc = " \
117# Allow overriding this separately 102# Allow overriding this separately
118DISTRIBUTION_PATCHES = "\ 103DISTRIBUTION_PATCHES = "\
119 patches/icedtea-crosscompile-fix.patch \ 104 patches/icedtea-crosscompile-fix.patch \
120 patches/icedtea-hostbuildcc.patch \
121 patches/icedtea-unbreak-float.patch \ 105 patches/icedtea-unbreak-float.patch \
122 patches/icedtea-remove_werror.patch \ 106 patches/icedtea-remove_werror.patch \
123 patches/icedtea-libnet-renaming.patch \ 107 patches/icedtea-libnet-renaming.patch \
124 patches/icedtea-fix-xrender.patch \
125 patches/icedtea-shark-arm-linux-cpu-detection.patch \ 108 patches/icedtea-shark-arm-linux-cpu-detection.patch \
126 patches/icedtea-corba-parallel-make.patch \ 109 patches/icedtea-corba-parallel-make.patch \
127 patches/icedtea-zero-hotspotfix.patch \ 110 patches/icedtea-zero-hotspotfix.patch \
diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb
deleted file mode 100644
index c7c0a06..0000000
--- a/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1require openjdk-7-release-03b21.inc
2
3PR = "${INC_PR}.0"
4
5
6SRC_URI[iced.md5sum] = "2921e31983a3874860cd784548af3ab9"
7SRC_URI[iced.sha256sum] = "ea68180fe8b40732ccea41cdd6c628de4f660b20fccb4cd87ab35f0727c08b11"
8
9OPENJDK_CHANGESET = "c1c649636704"
10SRC_URI[openjdk.md5sum] = "8da834a30f5f2b022b5c30bc14caef66"
11SRC_URI[openjdk.sha256sum] = "19018c45d97cecd9c753a6fc4b52af57cc93b65e3ee303c0750a7961171d5f3d"
12
13CORBA_CHANGESET = "313f1ee32118"
14SRC_URI[corba.md5sum] = "2c45acbfbc6af4bdcc16a2bb258ac5e4"
15SRC_URI[corba.sha256sum] = "9326c1fc0dedcbc2af386cb73b80727416e24664ccbf766221450f6e2138e952"
16
17JAXP_CHANGESET = "c04b95aa746c"
18SRC_URI[jaxp.md5sum] = "213491d6555fa4e380f8878e55b17e20"
19SRC_URI[jaxp.sha256sum] = "9df7d4d04168c9c6e57c5b51ca3a54defe5e892d56a256b3d3deda3b12173e63"
20
21JAXWS_CHANGESET = "d04602077b14"
22SRC_URI[jaxws.md5sum] = "628d1847ded0f020722ca5fb94e0969a"
23SRC_URI[jaxws.sha256sum] = "1ca9cb115591eb20143cf0d88a57f07fb631ea41246d05017e30a6ae3766517d"
24
25JDK_CHANGESET = "acaa2de9f547"
26SRC_URI[jdk.md5sum] = "46b123734ac2c028248647b07c76907d"
27SRC_URI[jdk.sha256sum] = "bbfa99c5d9900d16a9359fbdfd1cca9cbfd49095a823eb06ca56d75bca0a8eaf"
28
29LANGTOOLS_CHANGESET = "c63c8a2164e4"
30SRC_URI[langtools.md5sum] = "01715103e35a972a747c5f43f75cb4c0"
31SRC_URI[langtools.sha256sum] = "46d93bd9069d86ea233464d5a9777b12f0a027142b9ac665e3b244f69a5416b6"
32
33HOTSPOT_CHANGESET = "2c4981784101"
34SRC_URI[hotspot.md5sum] = "097f2fbd2fca7c40b2c502fcb343432e"
35SRC_URI[hotspot.sha256sum] = "977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b"
36
diff --git a/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
new file mode 100644
index 0000000..9058e42
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bb
@@ -0,0 +1,36 @@
1require openjdk-7-release-25b30.inc
2
3PR = "${INC_PR}.0"
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 2025-05-13 07:08:20 +0000