summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-6
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/openjdk-6')
-rw-r--r--recipes-core/openjdk/openjdk-6/build-hacks.patch31
-rw-r--r--recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch18
-rw-r--r--recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch37
-rw-r--r--recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch94
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch229
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch131
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch23
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch15
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch21
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch28
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch39
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch41
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch12
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch148
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch29
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch14
-rw-r--r--recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch18
-rw-r--r--recipes-core/openjdk/openjdk-6/jvm.cfg41
-rw-r--r--recipes-core/openjdk/openjdk-6/mkbc_returncode.patch11
-rw-r--r--recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch113
-rw-r--r--recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch13
-rw-r--r--recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch20
28 files changed, 0 insertions, 1202 deletions
diff --git a/recipes-core/openjdk/openjdk-6/build-hacks.patch b/recipes-core/openjdk/openjdk-6/build-hacks.patch
deleted file mode 100644
index 02a8300..0000000
--- a/recipes-core/openjdk/openjdk-6/build-hacks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-04-12 23:55:51.754838172 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-16 15:17:10.224708601 +0200
5@@ -477,6 +477,11 @@
6 JAVAC="" \
7 JAVA_HOME="" \
8 JDK_HOME="" \
9+ OE_CFLAGS="$(OE_CFLAGS)" \
10+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
11+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
12+ OE_LDFLAGS="$(OE_LDFLAGS)" \
13+ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
14 DISTRIBUTION_ID="$(DIST_ID)" \
15 DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
16 DEBUG_CLASSFILES="true" \
17Index: icedtea6-1.8/javac.in
18===================================================================
19--- icedtea6-1.8.orig/javac.in 2010-03-25 15:10:41.714835519 +0100
20+++ icedtea6-1.8/javac.in 2010-06-16 15:14:31.205334756 +0200
21@@ -35,7 +35,9 @@
22 elif [ ! -z "@ECJ@" ] ; then
23 @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS
24 else
25+ # Compiling hotspot-tools consumes tons of memory and exceeds any default
26+ # limits for jamvm and cacao.
27 CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
28- @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
29+ @JAVA@ -Xmx1024m org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
30 fi
31
diff --git a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch b/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch
deleted file mode 100644
index d676142..0000000
--- a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: cacao/cacao/src/mm/boehm-gc/os_dep.c
2===================================================================
3--- cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:15.000000000 +0100
4+++ cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:24.000000000 +0100
5@@ -1077,7 +1077,6 @@
6 c = stat_buf[buf_offset++];
7 }
8 close(f);
9- if (result < 0x10000000) ABORT("Absurd stack bottom value");
10 return (ptr_t)result;
11 }
12
diff --git a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch
deleted file mode 100644
index a153a32..0000000
--- a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Index: icedtea6-1.8.5/Makefile.am
2===================================================================
3--- icedtea6-1.8.5.orig/Makefile.am 2011-02-04 18:29:58.826701224 +0100
4+++ icedtea6-1.8.5/Makefile.am 2011-02-04 18:31:53.430016002 +0100
5@@ -1918,10 +1918,13 @@
6 if BUILD_CACAO
7 if !USE_SYSTEM_CACAO
8 cd cacao/cacao && \
9+ rm -f libtool && \
10+ autoreconf --verbose --install --force --no-recursive && \
11 $(ARCH_PREFIX) ./configure \
12 --host=$(host_alias) \
13 --build=$(build_alias) \
14 --target=$(target_alias) \
15+ --with-libtool-sysroot \
16 --prefix=$(abs_top_builddir)/cacao/install \
17 --with-java-runtime-library=openjdk \
18 --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
diff --git a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch b/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch
deleted file mode 100644
index 09ba984..0000000
--- a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Index: cacao/cacao/src/vm/jit/arm/codegen.c
2===================================================================
3--- cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:23:21.439856241 +0200
4+++ cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:41:24.278841537 +0200
5@@ -2353,10 +2353,12 @@
6
7 d = md->returntype.type;
8
9-#if !defined(__SOFTFP__)
10+#if !defined(__SOFTFP__) && !defined(__VFP_FP__)
11 /* TODO: this is only a hack, since we use R0/R1 for float
12 return! this depends on gcc; it is independent from
13- our ENABLE_SOFTFLOAT define */
14+ our ENABLE_SOFTFLOAT define
15+ It is only needed for -mfpu=fpa -mfloat-abi=hard!
16+ */
17 if (iptr->opc == ICMD_BUILTIN && d != TYPE_VOID && IS_FLT_DBL_TYPE(d)) {
18 #if 0 && !defined(NDEBUG)
19 dolog("BUILTIN that returns float or double (%s.%s)", m->clazz->name->text, m->name->text);
20@@ -3019,7 +3021,7 @@
21 s1 = (s4) (cd->mcodeptr - cd->mcodebase);
22 M_RECOMPUTE_PV(s1);
23
24-#if !defined(__SOFTFP__)
25+#if !defined(__SOFTFP__) && !defined(__VFP_FP__)
26 /* TODO: this is only a hack, since we use R0/R1 for float return! */
27 /* this depends on gcc; it is independent from our ENABLE_SOFTFLOAT define */
28 if (md->returntype.type != TYPE_VOID && IS_FLT_DBL_TYPE(md->returntype.type)) {
29@@ -3030,7 +3032,7 @@
30 /* M_CAST_FLT_TO_INT_TYPED(md->returntype.type, REG_FRESULT, REG_RESULT_TYPED(md->returntype.type)); */
31 if (IS_2_WORD_TYPE(md->returntype.type)) {
32 DCD(0xed2d8102); /* stfd f0, [sp, #-8]! */
33- M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8);
34+ M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8);
35 } else {
36 DCD(0xed2d0101); /* stfs f0, [sp, #-4]!*/
37 M_LDR_UPDATE(REG_RESULT, REG_SP, 4);
diff --git a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch b/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch
deleted file mode 100644
index 7c82daf..0000000
--- a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.8/configure.ac
2===================================================================
3--- icedtea6-1.8.orig/configure.ac
4+++ icedtea6-1.8/configure.ac
5@@ -472,7 +472,7 @@
6 if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then
7 continue
8 fi
9- if echo "$flag" | grep -q '^-l'; then
10+ if echo "$flag" | grep -q '^-l\|.so'; then
11 if test "x$LLVM_LIBS" != "x"; then
12 LLVM_LIBS="$LLVM_LIBS "
13 fi
diff --git a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch
deleted file mode 100644
index 3d4a68c..0000000
--- a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch
+++ /dev/null
@@ -1,94 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-06-18 12:31:34.534667003 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-18 12:31:34.714667729 +0200
5@@ -488,6 +488,7 @@
6 DEBUG_BINARIES="true" \
7 ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
8 VERBOSE="$(VERBOSE)" \
9+ CC_FOR_BUILD="$(CC_FOR_BUILD)" \
10 ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
11 ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect"
12
13Index: icedtea6-1.8/acinclude.m4
14===================================================================
15--- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.804836529 +0200
16+++ icedtea6-1.8/acinclude.m4 2010-06-18 12:31:34.714667729 +0200
17@@ -900,6 +900,21 @@
18 AC_SUBST(ALT_CACAO_SRC_DIR)
19 ])
20
21+AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
22+[
23+ AC_MSG_CHECKING(for compiler used for subsidiary programs)
24+ AC_ARG_WITH([cc-for-build],
25+ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
26+ [
27+ CC_FOR_BUILD="${withval}"
28+ ],
29+ [
30+ CC_FOR_BUILD="\$(CC)"
31+ ])
32+ AC_MSG_RESULT(${CC_FOR_BUILD})
33+ AC_SUBST(CC_FOR_BUILD)
34+])
35+
36 AC_DEFUN([AC_CHECK_WITH_GCJ],
37 [
38 AC_MSG_CHECKING([whether to compile ecj natively])
39Index: icedtea6-1.8/configure.ac
40===================================================================
41--- icedtea6-1.8.orig/configure.ac 2010-04-12 13:46:18.821086023 +0200
42+++ icedtea6-1.8/configure.ac 2010-06-18 12:31:34.724666321 +0200
43@@ -44,6 +44,7 @@
44 IT_CHECK_FOR_MERCURIAL
45 IT_OBTAIN_HG_REVISIONS
46 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
47+AC_CHECK_WITH_CC_FOR_BUILD
48 AC_CHECK_WITH_GCJ
49 AC_CHECK_WITH_HOTSPOT_BUILD
50 AC_PATH_TOOL([LINUX32],[linux32])
51Index: icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make
52===================================================================
53--- icedtea6-1.8.orig/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-03-25 15:10:42.061085966 +0100
54+++ icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-06-18 12:40:42.834666505 +0200
55@@ -32,6 +32,13 @@
56 Obj_Files += thumb2.o
57
58 CFLAGS += -DHOTSPOT_ASM
59+CCFLAGS += -DHOTSPOT_ASM
60+
61+ifeq ($(CROSS_COMPILATION), true)
62+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD)
63+else
64+ C_COMPILE_FOR_MKBC = $(C_COMPILE)
65+endif
66
67 %.o: %.S
68 @echo Assembling $<
69@@ -43,20 +50,20 @@
70
71 offsets_arm.s: mkoffsets
72 @echo Generating assembler offsets
73- ./mkoffsets > $@
74+ $(QEMU) ./mkoffsets > $@
75
76 bytecodes_arm.s: bytecodes_arm.def mkbc
77 @echo Generatine ARM assembler bytecode sequences
78 $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE)
79
80-mkbc: $(GAMMADIR)/tools/mkbc.c
81+mkbc: $(GAMMADIR)/tools/mkbc.c
82 @echo Compiling mkbc tool
83- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE)
84+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE)
85
86-mkoffsets: asm_helper.cpp
87+mkoffsets: asm_helper.cpp
88 @echo Compiling offset generator
89 $(QUIETLY) $(REMOVE_TARGET)
90- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
91+ $(CC_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
92
93 endif
94
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch
deleted file mode 100644
index 6ec83bb..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch
+++ /dev/null
@@ -1,229 +0,0 @@
1Index: openjdk/jdk/make/sun/awt/Makefile
2===================================================================
3--- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100
4+++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100
5@@ -509,10 +509,10 @@
6 #
7
8 ifeq ($(PLATFORM), linux)
9-CPPFLAGS += -I$(MOTIF_DIR)/include \
10- -I$(OPENWIN_HOME)/include \
11- -I$(OPENWIN_HOME)/include/X11/extensions \
12- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
13+#CPPFLAGS += -I$(MOTIF_DIR)/include \
14+# -I$(OPENWIN_HOME)/include \
15+# -I$(OPENWIN_HOME)/include/X11/extensions \
16+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
17 endif
18 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
19 -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
20@@ -536,7 +536,7 @@
21 $(EVENT_MODEL)
22
23 ifeq ($(PLATFORM), linux)
24-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
25+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
26 endif
27
28 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
29Index: openjdk/jdk/make/sun/awt/mawt.gmk
30===================================================================
31--- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100
32+++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100
33@@ -194,8 +194,8 @@
34 CPPFLAGS += -I$(CUPS_HEADERS_PATH)
35
36 ifndef HEADLESS
37-CPPFLAGS += -I$(OPENWIN_HOME)/include
38-LDFLAGS += -L$(OPENWIN_LIB)
39+#CPPFLAGS += -I$(OPENWIN_HOME)/include
40+#LDFLAGS += -L$(OPENWIN_LIB)
41
42 endif # !HEADLESS
43
44@@ -223,8 +223,8 @@
45
46 ifeq ($(PLATFORM), linux)
47 # Checking for the X11/extensions headers at the additional location
48- CPPFLAGS += -I/X11R6/include/X11/extensions \
49- -I/usr/include/X11/extensions
50+# CPPFLAGS += -I/X11R6/include/X11/extensions \
51+# -I/usr/include/X11/extensions
52 endif
53
54 ifeq ($(PLATFORM), solaris)
55Index: openjdk/jdk/make/sun/xawt/Makefile
56===================================================================
57--- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100
58+++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100
59@@ -123,11 +123,12 @@
60 -I$(PLATFORM_SRC)/native/sun/awt
61
62 ifeq ($(PLATFORM), linux)
63+# Very unsuitable for cross-compilation.
64 # Allows for builds on Debian GNU Linux, X11 is in a different place
65- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
66- -I/usr/include/X11/extensions \
67- -I$(MOTIF_DIR)/include \
68- -I$(OPENWIN_HOME)/include
69+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
70+# -I/usr/include/X11/extensions \
71+# -I$(MOTIF_DIR)/include \
72+# -I$(OPENWIN_HOME)/include
73 endif
74
75 ifeq ($(PLATFORM), solaris)
76Index: openjdk/hotspot/make/linux/makefiles/vm.make
77===================================================================
78--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100
79+++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100
80@@ -170,6 +170,7 @@
81 LIBS_VM += $(LLVM_LIBS)
82 endif
83
84+LFLAGS_VM += $(OE_LDFLAGS)
85 LINK_VM = $(LINK_LIB.c)
86
87 # rule for building precompiled header
88Index: openjdk/hotspot/make/linux/makefiles/buildtree.make
89===================================================================
90--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100
91+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100
92@@ -343,7 +343,7 @@
93 echo "rm -f Queens.class"; \
94 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
95 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
96- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
97+ echo 'echo Silently skipping the execution of the gamma program'; \
98 ) > $@
99 $(QUIETLY) chmod +x $@
100
101Index: openjdk/corba/make/common/Defs-linux.gmk
102===================================================================
103--- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100
104+++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100
105@@ -82,9 +82,9 @@
106 CC_NO_OPT =
107
108 ifeq ($(PRODUCT), java)
109- _OPT = $(CC_HIGHER_OPT)
110+ _OPT = $(OE_CFLAGS)
111 else
112- _OPT = $(CC_LOWER_OPT)
113+ _OPT = $(OE_CFLAGS)
114 CPPFLAGS_DBG += -DLOGGING
115 endif
116
117@@ -94,7 +94,7 @@
118 # as the default.
119 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
120 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
121-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
122+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
123 CFLAGS_REQUIRED_hppa +=
124 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
125 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
126@@ -221,7 +221,7 @@
127 #
128 # -L paths for finding and -ljava
129 #
130-LDFLAGS_OPT = -Xlinker -O1
131+LDFLAGS_OPT = $(OE_LDFLAGS)
132 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
133 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
134
135Index: openjdk/jdk/make/common/Defs-linux.gmk
136===================================================================
137--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100
138+++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100
139@@ -92,9 +92,9 @@
140 CC_NO_OPT =
141
142 ifeq ($(PRODUCT), java)
143- _OPT = $(CC_HIGHER_OPT)
144+ _OPT = $(OE_CFLAGS)
145 else
146- _OPT = $(CC_LOWER_OPT)
147+ _OPT = $(OE_CFLAGS)
148 CPPFLAGS_DBG += -DLOGGING
149 endif
150
151@@ -104,7 +104,7 @@
152 # as the default.
153 CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
154 CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
155-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
156+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
157 CFLAGS_REQUIRED_hppa +=
158 CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
159 CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
160@@ -231,7 +231,7 @@
161 #
162 # -L paths for finding and -ljava
163 #
164-LDFLAGS_OPT = -Xlinker -O1
165+LDFLAGS_OPT = $(OE_LDFLAGS)
166 LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
167 LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
168
169Index: openjdk/hotspot/make/linux/makefiles/gcc.make
170===================================================================
171--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100
172+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100
173@@ -119,7 +119,7 @@
174 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
175
176 # The flags to use for an Optimized g++ build
177-OPT_CFLAGS += -O3
178+OPT_CFLAGS += $(OE_CFLAGS)
179
180 # Hotspot uses very unstrict aliasing turn this optimization off
181 OPT_CFLAGS += -fno-strict-aliasing
182@@ -148,7 +148,7 @@
183 endif
184
185 # Enable linker optimization
186-LFLAGS += -Xlinker -O1
187+LFLAGS += $(OE_LDFLAGS)
188
189 # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
190 MAPFLAG = -Xlinker --version-script=FILENAME
191Index: openjdk/hotspot/make/linux/makefiles/launcher.make
192===================================================================
193--- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100
194+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100
195@@ -44,7 +44,7 @@
196 LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
197 else
198 LAUNCHER.o = launcher.o
199- LFLAGS_LAUNCHER += -L `pwd`
200+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS)
201 LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
202 endif
203
204Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile
205===================================================================
206--- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100
207+++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100
208@@ -245,7 +245,7 @@
209 $(CHMOD) +w $@;\
210 else \
211 $(ECHO) GENERATING $@; \
212- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
213+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
214 fi
215 @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
216 $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
217Index: openjdk/hotspot/make/linux/makefiles/jsig.make
218===================================================================
219--- openjdk/hotspot/make/linux/makefiles/jsig.make 2010-02-17 04:11:04.000000000 +0100
220+++ openjdk/hotspot/make/linux/makefiles/jsig.make 2011-11-18 22:56:03.923900991 +0100
221@@ -39,7 +39,7 @@
222 # cause problems with interposing. See CR: 6466665
223 # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
224
225-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT
226+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(OE_LDFLAGS)
227
228 # DEBUG_BINARIES overrides everything, use full -g debug information
229 ifeq ($(DEBUG_BINARIES), true)
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch b/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch
deleted file mode 100644
index 59d806d..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-06-17 10:29:13.654666801 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-17 10:30:50.334670771 +0200
5@@ -1750,7 +1745,7 @@
6 stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
7 if WITH_RHINO
8 mkdir -p rhino/rhino.{old,new}
9- (cd rhino/rhino.old ; jar xf $(RHINO_JAR))
10+ (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR))
11 $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
12 com.redhat.rewriter.ClassRewriter \
13 $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch b/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch
deleted file mode 100644
index 01dcb82..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch
+++ /dev/null
@@ -1,131 +0,0 @@
1Index: openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java
2===================================================================
3--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4+++ openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java 2011-11-18 20:44:00.281649848 +0100
5@@ -0,0 +1,38 @@
6+/*
7+ * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
8+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9+ *
10+ * This code is free software; you can redistribute it and/or modify it
11+ * under the terms of the GNU General Public License version 2 only, as
12+ * published by the Free Software Foundation. Sun designates this
13+ * particular file as subject to the "Classpath" exception as provided
14+ * by Sun in the LICENSE file that accompanied this code.
15+ *
16+ * This code is distributed in the hope that it will be useful, but WITHOUT
17+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
18+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
19+ * version 2 for more details (a copy is included in the LICENSE file that
20+ * accompanied this code).
21+ *
22+ * You should have received a copy of the GNU General Public License version
23+ * 2 along with this work; if not, write to the Free Software Foundation,
24+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
25+ *
26+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
27+ * CA 95054 USA or visit www.sun.com if you need additional information or
28+ * have any questions.
29+ */
30+package javax.swing;
31+
32+/**
33+ * An interface to tag things with a {@code getTransferHandler} method.
34+ */
35+interface HasGetTransferHandler {
36+
37+ /** Returns the {@code TransferHandler}.
38+ *
39+ * @return The {@code TransferHandler} or {@code null}
40+ */
41+ public TransferHandler getTransferHandler();
42+}
43+
44Index: openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java
45===================================================================
46--- openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 18:51:22.000000000 +0100
47+++ openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 20:44:01.628219313 +0100
48@@ -122,18 +122,6 @@
49 public static final int LINK = DnDConstants.ACTION_LINK;
50
51 /**
52- * An interface to tag things with a {@code getTransferHandler} method.
53- */
54- interface HasGetTransferHandler {
55-
56- /** Returns the {@code TransferHandler}.
57- *
58- * @return The {@code TransferHandler} or {@code null}
59- */
60- public TransferHandler getTransferHandler();
61- }
62-
63- /**
64 * Represents a location where dropped data should be inserted.
65 * This is a base class that only encapsulates a point.
66 * Components supporting drop may provide subclasses of this
67diff --git a/jdk/src/share/classes/javax/swing/JApplet.java b/jdk/src/share/classes/javax/swing/JApplet.java
68index 47f792a..72c2cf9 100644
69--- openjdk/jdk/src/share/classes/javax/swing/JApplet.java
70+++ openjdk/jdk/src/share/classes/javax/swing/JApplet.java
71@@ -91,7 +91,7 @@ import javax.accessibility.*;
72 */
73 public class JApplet extends Applet implements Accessible,
74 RootPaneContainer,
75- TransferHandler.HasGetTransferHandler
76+ HasGetTransferHandler
77 {
78 /**
79 * @see #getRootPane
80diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/share/classes/javax/swing/JComponent.java
81index 4293a4f..0c0a1dc 100644
82--- openjdk/jdk/src/share/classes/javax/swing/JComponent.java
83+++ openjdk/jdk/src/share/classes/javax/swing/JComponent.java
84@@ -171,7 +171,7 @@ import sun.swing.UIClientPropertyKey;
85 * @author Arnaud Weber
86 */
87 public abstract class JComponent extends Container implements Serializable,
88- TransferHandler.HasGetTransferHandler
89+ HasGetTransferHandler
90 {
91 /**
92 * @see #getUIClassID
93diff --git a/jdk/src/share/classes/javax/swing/JDialog.java b/jdk/src/share/classes/javax/swing/JDialog.java
94index a0193d1..aeeb243 100644
95--- openjdk/jdk/src/share/classes/javax/swing/JDialog.java
96+++ openjdk/jdk/src/share/classes/javax/swing/JDialog.java
97@@ -97,7 +97,7 @@ import javax.accessibility.*;
98 public class JDialog extends Dialog implements WindowConstants,
99 Accessible,
100 RootPaneContainer,
101- TransferHandler.HasGetTransferHandler
102+ HasGetTransferHandler
103 {
104 /**
105 * Key into the AppContext, used to check if should provide decorations
106diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/share/classes/javax/swing/JFrame.java
107index 9910b43..4cb8f58 100644
108--- openjdk/jdk/src/share/classes/javax/swing/JFrame.java
109+++ openjdk/jdk/src/share/classes/javax/swing/JFrame.java
110@@ -109,7 +109,7 @@ import javax.accessibility.*;
111 public class JFrame extends Frame implements WindowConstants,
112 Accessible,
113 RootPaneContainer,
114- TransferHandler.HasGetTransferHandler
115+ HasGetTransferHandler
116 {
117 /**
118 * The exit application default window close operation. If a window
119diff --git a/jdk/src/share/classes/javax/swing/JWindow.java b/jdk/src/share/classes/javax/swing/JWindow.java
120index c94803c..85bbb57 100644
121--- openjdk/jdk/src/share/classes/javax/swing/JWindow.java
122+++ openjdk/jdk/src/share/classes/javax/swing/JWindow.java
123@@ -91,7 +91,7 @@ import javax.accessibility.*;
124 */
125 public class JWindow extends Window implements Accessible,
126 RootPaneContainer,
127- TransferHandler.HasGetTransferHandler
128+ HasGetTransferHandler
129 {
130 /**
131 * The <code>JRootPane</code> instance that manages the
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch
deleted file mode 100644
index 5f2c98b..0000000
--- a/recipes-core/openjdk/openjdk-6/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-6/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch
deleted file mode 100644
index faa90ea..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200
5@@ -49,7 +49,6 @@
6 # include <string.h>
7 # include <syscall.h>
8 # include <sys/sysinfo.h>
9-# include <gnu/libc-version.h>
10 # include <sys/ipc.h>
11 # include <sys/shm.h>
12 # include <link.h>
13@@ -544,9 +543,7 @@
14 os::Linux::set_glibc_version(str);
15 } else {
16 // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
17- static char _gnu_libc_version[32];
18- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
19- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
20+ static char _gnu_libc_version[32] = "2.9";
21 os::Linux::set_glibc_version(_gnu_libc_version);
22 }
23
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch
deleted file mode 100644
index 7c5da59..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200
4+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200
5@@ -235,8 +235,8 @@
6
7 // Checking for finiteness
8
9-inline int g_isfinite(jfloat f) { return finite(f); }
10-inline int g_isfinite(jdouble f) { return finite(f); }
11+inline int g_isfinite(jfloat f) { return isfinite(f); }
12+inline int g_isfinite(jdouble f) { return isfinite(f); }
13
14
15 // Wide characters
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch
deleted file mode 100644
index 494e965..0000000
--- a/recipes-core/openjdk/openjdk-6/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-6/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch
deleted file mode 100644
index 7da41fd..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200
5@@ -4325,7 +4325,22 @@
6 // Linux doesn't yet have a (official) notion of processor sets,
7 // so just return the system wide load average.
8 int os::loadavg(double loadavg[], int nelem) {
9- return ::getloadavg(loadavg, nelem);
10+
11+ FILE *LOADAVG;
12+ double avg[3] = { 0.0, 0.0, 0.0 };
13+ int i, res = -1;;
14+
15+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
16+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
17+ res = 0;
18+ fclose(LOADAVG);
19+ }
20+
21+ for (i = 0; (i < nelem) && (i < 3); i++) {
22+ loadavg[i] = avg[i];
23+ }
24+
25+ return res;
26 }
27
28 void os::pause() {
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch
deleted file mode 100644
index 9c70ba1..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
2===================================================================
3--- openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:18:05.655136951 +0200
4+++ openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:20:29.601377967 +0200
5@@ -51,7 +51,7 @@
6 {
7 const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
8 // look up existing handle only, do not load
9- void *hModule = dlopen(libName, RTLD_NOLOAD);
10+ void *hModule = dlopen(libName, RTLD_LAZY);
11 dprintf2("-handle for %s: %u\n", libName, hModule);
12 (*env)->ReleaseStringUTFChars(env, jLibName, libName);
13 return (jlong)hModule;
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch
deleted file mode 100644
index 68f8581..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Index: openjdk/jdk/make/java/npt/Makefile
2===================================================================
3--- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200
4+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200
5@@ -65,6 +65,8 @@
6 # We don't want to link against -ljava
7 JAVALIB=
8
9+LDLIBS += -liconv
10+
11 # Add -export options to explicitly spell exported symbols
12 ifeq ($(PLATFORM), windows)
13 OTHER_LCF += -export:nptInitialize -export:nptTerminate
14Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
15===================================================================
16--- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200
17+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200
18@@ -123,6 +123,8 @@
19 # We don't want to link against -ljava
20 JAVALIB=
21
22+LDLIBS += -liconv
23+
24 #
25 # Add to ambient vpath so we pick up the library files
26 #
27Index: openjdk/jdk/make/sun/splashscreen/Makefile
28===================================================================
29--- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200
30+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200
31@@ -55,6 +55,8 @@
32
33 JAVALIB=
34
35+LDLIBS += -liconv
36+
37 #
38 # C Flags
39 #
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch
deleted file mode 100644
index 5423fde..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
2===================================================================
3--- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200
4+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200
5@@ -27,9 +27,6 @@
6 #include <X11/Xutil.h>
7 #include <X11/Xos.h>
8 #include <X11/Xatom.h>
9-#ifdef __linux__
10-#include <execinfo.h>
11-#endif
12
13 #include <jvm.h>
14 #include <jni.h>
15@@ -689,26 +686,6 @@
16 return ret;
17 }
18
19-#ifdef __linux__
20-void print_stack(void)
21-{
22- void *array[10];
23- size_t size;
24- char **strings;
25- size_t i;
26-
27- size = backtrace (array, 10);
28- strings = backtrace_symbols (array, size);
29-
30- fprintf (stderr, "Obtained %zd stack frames.\n", size);
31-
32- for (i = 0; i < size; i++)
33- fprintf (stderr, "%s\n", strings[i]);
34-
35- free (strings);
36-}
37-#endif
38-
39 Window get_xawt_root_shell(JNIEnv *env) {
40 static jclass classXRootWindow = NULL;
41 static jmethodID methodGetXRootWindow = NULL;
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch
deleted file mode 100644
index 40564f0..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: openjdk/jdk/make/com/sun/java/pack/Makefile
2===================================================================
3--- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200
4+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200
5@@ -103,6 +103,7 @@
6 OTHER_LDLIBS += $(LIBCXX) -lc
7 # setup the list of libraries to link in...
8 ifeq ($(PLATFORM), linux)
9+ OTHER_LDLIBS += -lpthread
10 ifeq ("$(CC_VER_MAJOR)", "3")
11 OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
12 endif
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch
deleted file mode 100644
index ee24afa..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: openjdk/hotspot/make/linux/makefiles/launcher.make
2===================================================================
3--- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:30:56.000000000 +0100
4+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:31:13.000000000 +0100
5@@ -45,7 +45,7 @@
6 else
7 LAUNCHER.o = launcher.o
8 LFLAGS_LAUNCHER += -L `pwd`
9- LIBS_LAUNCHER += -l$(JVM) $(LIBS)
10+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++
11 endif
12
13 LINK_LAUNCHER = $(LINK.c)
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch
deleted file mode 100644
index 024969d..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch
+++ /dev/null
@@ -1,148 +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/make/java/nio/Makefile
15===================================================================
16--- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200
17+++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200
18@@ -139,11 +139,11 @@
19 endif
20 ifeq ($(PLATFORM), linux)
21 COMPILER_WARNINGS_FATAL=true
22-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
23+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
24 endif
25 ifeq ($(PLATFORM), solaris)
26 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
27- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
28+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
29 endif # PLATFORM
30
31 #
32Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
33===================================================================
34--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200
35+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200
36@@ -58,7 +58,7 @@
37 */
38 static {
39 java.security.AccessController.doPrivileged(
40- new sun.security.action.LoadLibraryAction("net"));
41+ new sun.security.action.LoadLibraryAction("javanet"));
42 }
43
44 /**
45Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
46===================================================================
47--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200
48+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200
49@@ -74,7 +74,7 @@
50 */
51 static {
52 java.security.AccessController.doPrivileged(
53- new sun.security.action.LoadLibraryAction("net"));
54+ new sun.security.action.LoadLibraryAction("javanet"));
55 }
56
57 /**
58Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
59===================================================================
60--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200
61+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200
62@@ -47,7 +47,7 @@
63 */
64 static {
65 java.security.AccessController.doPrivileged(
66- new sun.security.action.LoadLibraryAction("net"));
67+ new sun.security.action.LoadLibraryAction("javanet"));
68 init();
69 }
70
71Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java
72===================================================================
73--- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200
74+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200
75@@ -230,7 +230,7 @@
76 static {
77 preferIPv6Address = java.security.AccessController.doPrivileged(
78 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
79- AccessController.doPrivileged(new LoadLibraryAction("net"));
80+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
81 init();
82 }
83
84Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
85===================================================================
86--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200
87+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200
88@@ -52,7 +52,7 @@
89 private boolean virtual = false;
90
91 static {
92- AccessController.doPrivileged(new LoadLibraryAction("net"));
93+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
94 init();
95 }
96
97Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
98===================================================================
99--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200
100+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200
101@@ -89,7 +89,7 @@
102 }});
103 if (b != null && b.booleanValue()) {
104 java.security.AccessController.doPrivileged(
105- new sun.security.action.LoadLibraryAction("net"));
106+ new sun.security.action.LoadLibraryAction("javanet"));
107 hasSystemProxies = init();
108 }
109 }
110Index: 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
111===================================================================
112--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200
113+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200
114@@ -354,7 +354,7 @@
115 return;
116 loaded = true;
117 java.security.AccessController
118- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
119+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
120 java.security.AccessController
121 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
122 // IOUtil must be initialized; Its native methods are called from
123Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
124===================================================================
125--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200
126+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200
127@@ -244,7 +244,7 @@
128
129 static {
130 java.security.AccessController.doPrivileged(
131- new sun.security.action.LoadLibraryAction("net"));
132+ new sun.security.action.LoadLibraryAction("javanet"));
133 }
134
135 }
136Index: 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
137===================================================================
138--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200
139+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200
140@@ -160,7 +160,7 @@
141
142 static {
143 java.security.AccessController.doPrivileged(
144- new sun.security.action.LoadLibraryAction("net"));
145+ new sun.security.action.LoadLibraryAction("javanet"));
146 init0();
147
148 // start the address listener thread
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch b/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch
deleted file mode 100644
index e47ee50..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp
2===================================================================
3--- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 20:38:09.000000000 +0100
4+++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 21:03:15.781644337 +0100
5@@ -38,7 +38,11 @@
6 #include <llvm/ModuleProvider.h>
7 #endif
8 #include <llvm/Support/IRBuilder.h>
9+#if SHARK_LLVM_VERSION >= 29
10+#include <llvm/Support/Threading.h>
11+#else
12 #include <llvm/System/Threading.h>
13+#endif
14 #include <llvm/Target/TargetSelect.h>
15 #include <llvm/Type.h>
16 #include <llvm/ExecutionEngine/JITMemoryManager.h>
17@@ -47,8 +51,12 @@
18 #include <llvm/ExecutionEngine/JIT.h>
19 #include <llvm/ADT/StringMap.h>
20 #include <llvm/Support/Debug.h>
21+#if SHARK_LLVM_VERSION >= 29
22+#include <llvm/Support/Host.h>
23+#else
24 #include <llvm/System/Host.h>
25 #endif
26+#endif
27
28 #include <map>
29
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch
deleted file mode 100644
index f2ad035..0000000
--- a/recipes-core/openjdk/openjdk-6/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-6/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch
deleted file mode 100644
index 9f875de..0000000
--- a/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
2===================================================================
3--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100
4+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100
5@@ -27,13 +27,11 @@
6
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) || \
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-6/jvm.cfg b/recipes-core/openjdk/openjdk-6/jvm.cfg
deleted file mode 100644
index 9e008e9..0000000
--- a/recipes-core/openjdk/openjdk-6/jvm.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
1# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
2# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3#
4# This code is free software; you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 2 only, as
6# published by the Free Software Foundation. Sun designates this
7# particular file as subject to the "Classpath" exception as provided
8# by Sun in the LICENSE file that accompanied this code.
9#
10# This code is distributed in the hope that it will be useful, but WITHOUT
11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13# version 2 for more details (a copy is included in the LICENSE file that
14# accompanied this code).
15#
16# You should have received a copy of the GNU General Public License version
17# 2 along with this work; if not, write to the Free Software Foundation,
18# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19#
20# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
21# CA 95054 USA or visit www.sun.com if you need additional information or
22# have any questions.
23#
24#
25# List of JVMs that can be used as an option to java, javac, etc.
26# Order is important -- first in this list is the default JVM.
27# NOTE that this both this file and its format are UNSUPPORTED and
28# WILL GO AWAY in a future release.
29#
30# You may also select a JVM in an arbitrary location with the
31# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
32# and may not be available in a future release.
33#
34-server ERROR
35-client IGNORE
36-hotspot ERROR
37-classic WARN
38-native ERROR
39-green ERROR
40-zero ALIASED_TO -server
41-cacao ERROR
diff --git a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch b/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch
deleted file mode 100644
index 13280b3..0000000
--- a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1Index: icedtea6/ports/hotspot/tools/mkbc.c
2===================================================================
3--- icedtea6.orig/ports/hotspot/tools/mkbc.c 2010-04-01 12:25:13.791317722 +0200
4+++ icedtea6/ports/hotspot/tools/mkbc.c 2010-04-01 12:27:34.151606177 +0200
5@@ -602,4 +602,6 @@
6 if (ferror(bci_f)) fatal("Error writing bci");
7 if (source_f != stdin) fclose(source_f);
8 if (bci_f != stdout) fclose(bci_f);
9+
10+ return 0;
11 }
diff --git a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch
deleted file mode 100644
index df9e147..0000000
--- a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch
+++ /dev/null
@@ -1,113 +0,0 @@
1Index: icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
2===================================================================
3--- icedtea6-1.8.orig/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200
4+++ icedtea6-1.8/ports/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-6/shark-build-openjdkdir.patch b/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch
deleted file mode 100644
index 4e89967..0000000
--- a/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: icedtea6-1.8/Makefile.am
2===================================================================
3--- icedtea6-1.8.orig/Makefile.am 2010-06-30 11:30:49.526648376 +0200
4+++ icedtea6-1.8/Makefile.am 2010-06-30 11:42:02.606648734 +0200
5@@ -1882,7 +1882,7 @@
6 # configure script arguments, quoted in single quotes
7 CONFIGURE_ARGS = @CONFIGURE_ARGS@
8 ADD_ZERO_CONFIGURE_ARGS = \
9- --with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
10+ --with-openjdk=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
11 --enable-zero
12 if ADD_SHARK_BUILD
13 ADD_ZERO_CONFIGURE_ARGS += \
diff --git a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch b/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch
deleted file mode 100644
index ca21ccf..0000000
--- a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Index: icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
2===================================================================
3--- icedtea6-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:26:16.885292426 +0200
4+++ icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:29:19.034668305 +0200
5@@ -266,7 +266,15 @@
6 volatile jlong* dest,
7 jlong compare_value) {
8
9+#ifdef ARM
10+ return arm_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value);
11+#else
12+#ifdef M68K
13+ return m68k_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value);
14+#else
15 return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
16+#endif // M68K
17+#endif // ARM
18 }
19
20 inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-09 10:56:50 +0000