/hg/icedtea6-hg: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 9 07:27:11 PST 2012
changeset d240889408be in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d240889408be
author: aph
date: Mon Feb 20 12:02:21 2012 +0000
Don't use shared Eden in incremental mode.
2012-02-20 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (Helper_new):
Don't use shared Eden in incremental mode.
changeset 8d0e6091efad in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8d0e6091efad
author: aph
date: Mon Feb 20 15:59:31 2012 +0000
merge ChangeLog
changeset e77e59c08299 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e77e59c08299
author: aph
date: Mon Feb 20 16:03:08 2012 +0000
Add PR# to ChangeLog.
changeset 01123e3102cc in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=01123e3102cc
author: aph
date: Wed Feb 22 15:36:29 2012 +0000
Math inlines for ARM.
2012-02-22 Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
(handle_special_method, jstack_to_vfp, vfp_to_jstack): New
functions.
(Thumb2_codegen): Call handle_special_method.
(t_vop_ops): Add VSQRT.
(T_VMOVD_VFP_TOVFP): New macro.
(vmov_reg_d_VFP_to_VFP): New function.
changeset 6b69d846d8cb in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6b69d846d8cb
author: ptisnovs
date: Fri Feb 24 13:52:49 2012 +0100
Added patch with JavaDoc fixes for ScriptEngineManager class & minor
Makefile.am correction.
changeset 44f51ec924fa in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=44f51ec924fa
author: ptisnovs
date: Mon Feb 27 11:50:34 2012 +0100
Backport of S6883983: JarVerifier dependency on sun.security.pkcs should be removed
changeset 54ceda20a02c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=54ceda20a02c
author: ptisnovs
date: Mon Feb 27 14:40:52 2012 +0100
Backport of S4465490: Suspicious about double-check locking idiom being
used in the code.
changeset b8d810f20366 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b8d810f20366
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Mar 02 16:08:50 2012 +0100
Fix ARM SIGILL crash during BLX call to thumb compiled StrictMath intrinsics.
2012-03-02 Xerxes Ranby <xerxes at zafena.se>
Andrew Haley <aph at redhat.com>
* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
(handle_special_method): Fix a off by one byte SIGILL crash
during BLX call to thumb compiled StrictMath intrinsics for
--with-float=hard --with-mode=thumb ARM builds.
changeset 3065aa2f9f1b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3065aa2f9f1b
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Mar 09 13:28:45 2012 +0000
Merge
changeset d73113d5c0ba in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d73113d5c0ba
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Mar 09 15:26:58 2012 +0000
Drop upstreamed security patches.
2012-03-09 Andrew John Hughes <ahughes at redhat.com>
* patches/security/20120214/7082299.patch,
* patches/security/20120214/7088367.patch,
* patches/security/20120214/7110683.patch,
* patches/security/20120214/7110687.patch,
* patches/security/20120214/7110700.patch,
* patches/security/20120214/7110704.patch,
* patches/security/20120214/7118283.patch,
* patches/security/20120214/7126960.patch:
Removed; upstream.
* Makefile.am: Drop above patches.
diffstat:
ChangeLog | 78 +
Makefile.am | 21 +-
NEWS | 2 +
arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 2 +-
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 139 ++-
patches/ScriptEngineManager-doc.patch | 28 +
patches/ecj/icedtea.patch | 87 +-
patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch | 20 +
patches/openjdk/6633275-shaped_translucent_windows.patch | 7 -
patches/openjdk/6725214-direct3d-01.patch | 7 -
patches/openjdk/6851973-kerberos.patch | 200 ----
patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch | 22 +
patches/openjdk/7091528-javadoc_class_files.patch | 187 ----
patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ----------
patches/openjdk/7103725-ssl_beast_regression.patch | 21 -
patches/security/20120214/7082299.patch | 200 ----
patches/security/20120214/7088367.patch | 43 -
patches/security/20120214/7110683.patch | 169 ---
patches/security/20120214/7110687.patch | 232 ----
patches/security/20120214/7110700.patch | 41 -
patches/security/20120214/7110704.patch | 60 -
patches/security/20120214/7118283.patch | 26 -
patches/security/20120214/7126960.patch | 80 -
23 files changed, 336 insertions(+), 1802 deletions(-)
diffs (truncated from 2644 to 500 lines):
diff -r 49f9beb1f03c -r d73113d5c0ba ChangeLog
--- a/ChangeLog Wed Feb 15 15:48:21 2012 +0000
+++ b/ChangeLog Fri Mar 09 15:26:58 2012 +0000
@@ -1,3 +1,62 @@
+2012-03-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20120214/7082299.patch,
+ * patches/security/20120214/7088367.patch,
+ * patches/security/20120214/7110683.patch,
+ * patches/security/20120214/7110687.patch,
+ * patches/security/20120214/7110700.patch,
+ * patches/security/20120214/7110704.patch,
+ * patches/security/20120214/7118283.patch,
+ * patches/security/20120214/7126960.patch:
+ Removed; upstream.
+ * Makefile.am: Drop above patches.
+
+2012-03-02 Xerxes RÃ¥nby <xerxes at zafena.se>
+ Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
+ (handle_special_method): Fix a off by one byte SIGILL crash
+ during BLX call to thumb compiled StrictMath intrinsics for
+ --with-float=hard --with-mode=thumb ARM builds.
+
+2012-02-27 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Mention backport.
+ * patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch:
+ Backport of S4465490: Suspicious about double-check locking idiom being
+ used in the code.
+
+2012-02-27 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * NEWS: Mention backport.
+ * patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch:
+ Backport of S6883983: JarVerifier dependency on
+ sun.security.pkcs should be removed
+
+2012-02-24 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/ScriptEngineManager-doc.patch:
+ Added patch with JavaDoc fixes for ScriptEngineManager class.
+ * Makefile.am: updated
+
+2012-02-22 Andrew Haley <aph at redhat.com>
+
+ * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
+ (handle_special_method, jstack_to_vfp, vfp_to_jstack): New
+ functions.
+ (Thumb2_codegen): Call handle_special_method.
+ (t_vop_ops): Add VSQRT.
+ (T_VMOVD_VFP_TOVFP): New macro.
+ (vmov_reg_d_VFP_to_VFP): New function.
+
+2012-02-20 Andrew Haley <aph at redhat.com>
+
+ PR584:
+ * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (Helper_new):
+ Don't use shared Eden in incremental mode.
+
2012-02-15 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Bring in 1.8.13, 1.9.13 and 1.10.6
@@ -102,6 +161,20 @@
(Thumb2_Return): Pass stackdepth to Thumb2_Safepoint.
(Thumb2_codegen): Pass stackdepth to Thumb2_Return.
+2012-01-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6851973-kerberos.patch,
+ * patches/openjdk/7091528-javadoc_class_files.patch,
+ * patches/openjdk/7102369-7094468-rmiregistry.patch,
+ * patches/openjdk/7103725-ssl_beast_regression.patch:
+ Dropped; upstream.
+ * Makefile.am: Remove dropped patches.
+ * patches/ecj/icedtea.patch: Updated due to 6790292.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/6725214-direct3d-01.patch:
+ Remove copyright notice changes broken as a result of the annoying
+ 7128474 change.
+
2012-01-18 Xerxes RÃ¥nby <xerxes at zafena.se>
* openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
@@ -1786,6 +1859,11 @@
2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+ * Makefile.am:
+ Bump to b25 (next version in hg).
+
+2011-11-28 Andrew John Hughes <ahughes at redhat.com>
+
* NEWS:
Remove inaccurate line about ARM assembler.
diff -r 49f9beb1f03c -r d73113d5c0ba Makefile.am
--- a/Makefile.am Wed Feb 15 15:48:21 2012 +0000
+++ b/Makefile.am Fri Mar 09 15:26:58 2012 +0000
@@ -2,7 +2,7 @@
OPENJDK_DATE = 14_nov_2011
OPENJDK_SHA256SUM = f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227
-OPENJDK_VERSION = b24
+OPENJDK_VERSION = b25
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = cff92704c4e0
@@ -201,15 +201,7 @@
ICEDTEA_FSG_PATCHES =
-SECURITY_PATCHES = \
- patches/security/20120214/7082299.patch \
- patches/security/20120214/7088367.patch \
- patches/security/20120214/7110683.patch \
- patches/security/20120214/7110687.patch \
- patches/security/20120214/7110700.patch \
- patches/security/20120214/7110704.patch \
- patches/security/20120214/7118283.patch \
- patches/security/20120214/7126960.patch
+SECURITY_PATCHES =
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -412,15 +404,14 @@
patches/arm-debug.patch \
patches/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
- patches/openjdk/7102369-7094468-rmiregistry.patch \
- patches/openjdk/6851973-kerberos.patch \
- patches/openjdk/7091528-javadoc_class_files.patch \
- patches/openjdk/7103725-ssl_beast_regression.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
- patches/openjdk/remove-mimpure-option-to-gcc.patch
+ patches/openjdk/remove-mimpure-option-to-gcc.patch \
+ patches/ScriptEngineManager-doc.patch \
+ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
+ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 49f9beb1f03c -r d73113d5c0ba NEWS
--- a/NEWS Wed Feb 15 15:48:21 2012 +0000
+++ b/NEWS Fri Mar 09 15:26:58 2012 +0000
@@ -18,6 +18,8 @@
- S6706974: Add krb5 test infrastructure
- S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
- S6761072: new krb5 tests fail on multiple platforms
+ - S6883983: JarVerifier dependency on sun.security.pkcs should be removed
+ - S4465490: Suspicious about double-check locking idiom being used in the code
New in release 1.10.6 (2012-02-14):
diff -r 49f9beb1f03c -r d73113d5c0ba arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Wed Feb 15 15:48:21 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Fri Mar 09 15:26:58 2012 +0000
@@ -141,7 +141,7 @@
if (UseTLAB) {
result = (oop) thread->tlab().allocate(obj_size);
}
- if (result == NULL) {
+ if (result == NULL && !CMSIncrementalMode) {
need_zero = true;
// Try allocate in shared eden
retry:
diff -r 49f9beb1f03c -r d73113d5c0ba arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Feb 15 15:48:21 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Mar 09 15:26:58 2012 +0000
@@ -1557,7 +1557,7 @@
} while (!(bc_stackinfo[bci] & BC_BRANCH_TARGET));
return 0;
}
-#endif // ZOMBIT_DETECTION
+#endif // ZOMBIE_DETECTION
void Thumb2_RegAlloc(Thumb2_Info *jinfo)
{
@@ -1991,12 +1991,14 @@
#define VP_SUB 1
#define VP_MUL 2
#define VP_DIV 3
+#define VP_SQRT 4
static const unsigned t_vop_ops[] = {
0xee300a00, // VADD
0xee300a40, // VSUB
0xee200a00, // VMUL
0xee800a00, // VDIV
+ 0xeeb10bc0 // VSQRT
};
#define VP_REG(op) t_vop_ops[op]
@@ -2162,6 +2164,9 @@
#define T_VMOVD_TOVFP(dst, src_lo, src_hi) \
(0xec400b10 | ((src_lo) << 12) | ((src_hi) << 16) | (((dst) & 0x10)<<(5-4)) | ((dst) & 0x0f))
+// VFP reg to VFP re move.
+#define T_VMOVD_VFP_TOVFP(dst, src) (0xeeb00b40 | (((dst) & 0x0f) << 12) | ((src) & 0x0f))
+
#define T_VOP_REG_S(op, dst, lho, rho) ((op) | \
(((dst) & 1) << 22) | (((dst) & 0x1e) << (12-1)) | \
(((lho) & 1) << 7) | (((lho) & 0x1e) << (16-1)) | \
@@ -2730,6 +2735,11 @@
return out_16x2(codebuf, T_VMOVD_TOVFP(dst, src_lo, src_hi));
}
+int vmov_reg_d_VFP_to_VFP(CodeBuf *codebuf, u32 dst, u32 src)
+{
+ return out_16x2(codebuf, T_VMOVD_VFP_TOVFP(dst, src));
+}
+
int vmov_reg_d_toARM(CodeBuf *codebuf, u32 dst_lo, u32 dst_hi, u32 src)
{
return out_16x2(codebuf, T_VMOVD_TOARM(dst_lo, dst_hi, src));
@@ -4976,6 +4986,129 @@
extern "C" void _ZN18InterpreterRuntime18register_finalizerEP10JavaThreadP7oopDesc(void);
+// Push VFP_REG to the java stack.
+static void vfp_to_jstack(Thumb2_Info *jinfo, int vfp_reg) {
+ Thumb2_Stack *jstack = jinfo->jstack;
+ unsigned r_lo, r_hi;
+ r_hi = PUSH(jstack, JSTACK_REG(jstack));
+ r_lo = PUSH(jstack, JSTACK_REG(jstack));
+ vmov_reg_d_toARM(jinfo->codebuf, r_lo, r_hi, vfp_reg);
+}
+
+// Pop the java stack to VFP_REG .
+static void jstack_to_vfp(Thumb2_Info *jinfo, int vfp_reg) {
+ Thumb2_Stack *jstack = jinfo->jstack;
+ unsigned r_lo, r_hi;
+ Thumb2_Fill(jinfo, 2);
+ r_lo = POP(jstack);
+ r_hi = POP(jstack);
+ vmov_reg_d_toVFP(jinfo->codebuf, vfp_reg, r_lo, r_hi);
+ Thumb2_Flush(jinfo);
+}
+
+// Expand a call to a "special" method. These are usually inlines of
+// java.lang.Math methods. Return true if the inlining succeeded.
+static bool handle_special_method(methodOop callee, Thumb2_Info *jinfo) {
+#ifdef __ARM_PCS_VFP
+ Thumb2_Stack *jstack = jinfo->jstack;
+
+ const char *entry_name;
+
+ unsigned loc1 = 0;
+
+ switch (Interpreter::method_kind(callee)) {
+ case Interpreter::java_lang_math_abs:
+ {
+ unsigned r_lo, r_hi;
+
+ Thumb2_Fill(jinfo, 2);
+ r_lo = POP(jstack);
+ r_hi = POP(jstack);
+ dop_imm_s(jinfo->codebuf, DP_BIC, r_hi, r_hi, 0x80000000, 0);
+ PUSH(jstack, r_hi);
+ PUSH(jstack, r_lo);
+
+ return true;
+ }
+
+ case Interpreter::java_lang_math_sin:
+ entry_name = "Java_java_lang_StrictMath_sin";
+ break;
+
+ case Interpreter::java_lang_math_cos:
+ entry_name = "Java_java_lang_StrictMath_cos";
+ break;
+
+ case Interpreter::java_lang_math_tan:
+ entry_name = "Java_java_lang_StrictMath_tan";
+ break;
+
+ case Interpreter::java_lang_math_sqrt:
+ {
+ void *entry_point = dlsym(NULL, "Java_java_lang_StrictMath_sqrt");
+ if (! entry_point)
+ return false;
+
+ unsigned r_lo, r_hi, r_res_lo, r_res_hi;
+
+ // Make sure that canonical NaNs are returned, as per the spec.
+ //
+ // Generate:
+ // vsqrt.f64 d0, d1
+ // vcmp.f64 d0, d0
+ // vmrs APSR_nzcv, fpscr
+ // beq.n 0f
+ // vmov.f64 d0, d1
+ // blx Java_java_lang_StrictMath_sqrt
+ // 0:
+ jstack_to_vfp(jinfo, VFP_D1);
+ vop_reg_d(jinfo->codebuf, VP_SQRT, VFP_D0, 0, VFP_D1);
+ vcmp_reg_d(jinfo->codebuf, VFP_D0, VFP_D0, 0);
+ vmrs(jinfo->codebuf, ARM_PC);
+ int loc = forward_16(jinfo->codebuf);
+ vmov_reg_d_VFP_to_VFP(jinfo->codebuf, VFP_D0, VFP_D1);
+ // FIXME: The JNI StrictMath routines don't use the JNIEnv *env
+ // parameter, so it's arguably pointless to pass it here.
+ add_imm(jinfo->codebuf, ARM_R0, Rthread, THREAD_JNI_ENVIRONMENT);
+ blx(jinfo->codebuf, (unsigned)entry_point);
+ bcc_patch(jinfo->codebuf, COND_EQ, loc);
+ vfp_to_jstack(jinfo, VFP_D0);
+
+ return true;
+ }
+
+ case Interpreter::java_lang_math_log:
+ entry_name = "Java_java_lang_StrictMath_log";
+ break;
+
+ case Interpreter::java_lang_math_log10:
+ entry_name = "Java_java_lang_StrictMath_log10";
+ break;
+
+ default:
+ return false;
+ }
+
+ void *entry_point = dlsym(NULL, entry_name);
+ if (! entry_point)
+ return false;
+
+ unsigned r_lo, r_hi, r_res_lo, r_res_hi;
+
+ jstack_to_vfp(jinfo, VFP_D0);
+ // FIXME: The JNI StrictMath routines don't use the JNIEnv *env
+ // parameter, so it's arguably pointless to pass it here.
+ add_imm(jinfo->codebuf, ARM_R0, Rthread, THREAD_JNI_ENVIRONMENT);
+ mov_imm(jinfo->codebuf, ARM_IP, (unsigned)entry_point);
+ blx_reg(jinfo->codebuf, ARM_IP);
+ vfp_to_jstack(jinfo, VFP_D0);
+
+ return true;
+#else
+ return false;
+#endif // __ARM_PCS_VFP
+}
+
void Thumb2_codegen(Thumb2_Info *jinfo, unsigned start)
{
unsigned code_size = jinfo->code_size;
@@ -6044,6 +6177,10 @@
}
callee = (methodOop)cache->f1();
+
+ if (handle_special_method(callee, jinfo))
+ break;
+
if (callee->is_accessor()) {
u1 *code = callee->code_base();
int index = GET_NATIVE_U2(&code[2]);
diff -r 49f9beb1f03c -r d73113d5c0ba patches/ScriptEngineManager-doc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ScriptEngineManager-doc.patch Fri Mar 09 15:26:58 2012 +0000
@@ -0,0 +1,29 @@
+--- openjdk.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2011-11-14 23:11:55.000000000 +0100
++++ openjdk/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2012-02-24 12:01:38.745796422 +0100
+@@ -39,7 +39,7 @@
+ * collection of key/value pairs storing state shared by all engines created
+ * by the Manager. This class uses the <a href="../../../technotes/guides/jar/jar.html#Service%20Provider">service provider</a> mechanism to enumerate all the
+ * implementations of <code>ScriptEngineFactory</code>. <br><br>
+- * The <code>ScriptEngineManager</code> provides a method to return an array of all these factories
++ * The <code>ScriptEngineManager</code> provides a method to return a list of all these factories
+ * as well as utility methods which look up factories on the basis of language name, file extension
+ * and mime type.
+ * <p>
+@@ -202,7 +202,7 @@
+ * The algorithm first searches for a <code>ScriptEngineFactory</code> that has been
+ * registered as a handler for the specified name using the <code>registerEngineName</code>
+ * method.
+- * <br><br> If one is not found, it searches the array of <code>ScriptEngineFactory</code> instances
++ * <br><br> If one is not found, it searches the set of <code>ScriptEngineFactory</code> instances
+ * stored by the constructor for one with the specified name. If a <code>ScriptEngineFactory</code>
+ * is found by either method, it is used to create instance of <code>ScriptEngine</code>.
+ * @param shortName The short name of the <code>ScriptEngine</code> implementation.
+@@ -351,7 +351,7 @@
+ }
+
+ /**
+- * Returns an array whose elements are instances of all the <code>ScriptEngineFactory</code> classes
++ * Returns a list whose elements are instances of all the <code>ScriptEngineFactory</code> classes
+ * found by the discovery mechanism.
+ * @return List of all discovered <code>ScriptEngineFactory</code>s.
+ */
diff -r 49f9beb1f03c -r d73113d5c0ba patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Wed Feb 15 15:48:21 2012 +0000
+++ b/patches/ecj/icedtea.patch Fri Mar 09 15:26:58 2012 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2010-05-26 15:02:51.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2012-01-18 21:43:04.134185695 +0000
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2010-05-26 15:02:51.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2012-01-18 21:43:04.146185899 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -281,8 +281,8 @@
-#
-include $(BUILDDIR)/common/Rules.gmk
diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
---- openjdk-ecj.orig/corba/make/common/Defs.gmk 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2010-05-26 15:02:51.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2011-01-10 21:21:55.000000000 +0000
++++ openjdk-ecj/corba/make/common/Defs.gmk 2012-01-18 21:43:04.146185899 +0000
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -297,7 +297,7 @@
#
# Get platform definitions
#
-@@ -129,8 +136,6 @@
+@@ -118,8 +125,6 @@
# for build tool jar files
BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
@@ -306,7 +306,7 @@
# for generated C source files (not javah)
GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
# for imported source files
-@@ -231,7 +236,7 @@
+@@ -220,7 +225,7 @@
# We define an intermediate variable for Java files because
# we use its value later to help define $SOURCEPATH
@@ -316,9 +316,9 @@
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2010-05-26 14:24:58.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2010-05-26 15:02:51.000000000 +0100
-@@ -272,7 +272,7 @@
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2012-01-18 16:50:50.977002556 +0000
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2012-01-18 21:43:04.146185899 +0000
+@@ -271,7 +271,7 @@
#
VM_NAME = server
JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
@@ -328,25 +328,25 @@
#
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
---- openjdk-ecj.orig/corba/make/common/Rules.gmk 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2010-05-26 15:02:51.000000000 +0100
-@@ -197,8 +197,10 @@
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2012-01-18 14:06:25.120768497 +0000
++++ openjdk-ecj/corba/make/common/Rules.gmk 2012-01-18 21:44:43.635816486 +0000
+@@ -201,8 +201,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
$(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \
-+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \
-+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+- $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+- $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \
++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \
++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
fi
@$(java-vm-cleanup)
diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2010-05-26 14:24:58.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2010-05-26 15:02:51.000000000 +0100
-@@ -117,31 +117,13 @@
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000
+@@ -120,31 +120,13 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
@@ -384,7 +384,7 @@
ifdef JAVAC
diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2010-05-26 09:31:18.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2010-05-26 15:02:51.000000000 +0100
More information about the distro-pkg-dev
mailing list