changeset in /hg/icedtea: Remove unneeded zero patches, update h...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:14:01 PDT 2008
changeset 837336085669 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=837336085669
description:
Remove unneeded zero patches, update hotspot patch and separate Override patch.
diffstat:
6 files changed, 42 insertions(+), 73 deletions(-)
ChangeLog | 15 ++++++++
Makefile.am | 5 +-
Makefile.in | 5 +-
patches/icedtea-ecj.patch | 19 ----------
patches/icedtea-hotspot7-build-fixes.patch | 52 ++--------------------------
patches/icedtea-override.patch | 19 ++++++++++
diffs (185 lines):
diff -r c67694e0e00b -r 837336085669 ChangeLog
--- a/ChangeLog Tue May 27 20:01:27 2008 +0100
+++ b/ChangeLog Tue May 27 20:24:02 2008 +0100
@@ -1,3 +1,18 @@ 2008-05-26 Andrew John Hughes <gnu_and
+2008-05-27 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Remove unneeded zero patches and include
+ new override patch.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-ecj.patch:
+ Remove override patch.
+ * patches/icedtea-hotspot7-build-fixes.patch:
+ Remove changes no longer required with b26.
+ * patches/icedtea-override.patch:
+ New separate file for @Override patch so it
+ can be applied early enough for some versions
+ of ecj.
+
2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r c67694e0e00b -r 837336085669 Makefile.am
--- a/Makefile.am Tue May 27 20:01:27 2008 +0100
+++ b/Makefile.am Tue May 27 20:24:02 2008 +0100
@@ -276,10 +276,8 @@ OPENJDK_PATCHES = \
# If ZERO_BUILD is set then we are building zero and need
# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
ZERO_PATCHES = \
- patches/icedtea-hotspot-6b06-7b24.patch \
patches/icedtea-hotspot7-build-fixes.patch \
patches/icedtea-bytecodeInterpreter.patch \
- patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
@@ -342,7 +340,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) \
- patches/icedtea-xslfix.patch
+ patches/icedtea-xslfix.patch \
+ patches/icedtea-override.patch
if WITH_CACAO
ICEDTEA_PATCHES += \
diff -r c67694e0e00b -r 837336085669 Makefile.in
--- a/Makefile.in Tue May 27 20:01:27 2008 +0100
+++ b/Makefile.in Tue May 27 20:24:02 2008 +0100
@@ -373,10 +373,8 @@ OPENJDK_PATCHES = \
# If ZERO_BUILD is set then we are building zero and need
# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
ZERO_PATCHES = \
- patches/icedtea-hotspot-6b06-7b24.patch \
patches/icedtea-hotspot7-build-fixes.patch \
patches/icedtea-bytecodeInterpreter.patch \
- patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
@@ -421,7 +419,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
$(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
- patches/icedtea-xslfix.patch $(am__append_7)
+ patches/icedtea-xslfix.patch patches/icedtea-override.patch \
+ $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = $(abs_top_srcdir)/patches/icedtea-ecj.patch
diff -r c67694e0e00b -r 837336085669 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Tue May 27 20:01:27 2008 +0100
+++ b/patches/icedtea-ecj.patch Tue May 27 20:24:02 2008 +0100
@@ -1626,25 +1626,6 @@ diff -Nru openjdk-ecj.orig/jdk/src/share
/**
* Maximum exponent a finite {@code float} variable may have. It
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:27:49.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:28:38.000000000 +0100
-@@ -113,7 +113,6 @@
- * @exception BadBinaryOpValueExpException
- *
- */
-- @Override
- public ValueExp apply(ObjectName name) throws BadStringOperationException, BadBinaryOpValueExpException,
- BadAttributeValueExpException, InvalidApplicationException {
- Object result = getAttribute(name);
-@@ -150,7 +149,6 @@
- evaluted an AttributeValueExp can only appear inside a QueryExp,
- and that QueryExp will itself have done setMBeanServer. */
- @Deprecated
-- @Override
- public void setMBeanServer(MBeanServer s) {
- }
-
diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
--- openjdk-ecj.orig/langtools/make/Makefile 2008-05-26 01:29:37.000000000 +0100
+++ openjdk-ecj/langtools/make/Makefile 2008-05-26 01:35:42.000000000 +0100
diff -r c67694e0e00b -r 837336085669 patches/icedtea-hotspot7-build-fixes.patch
--- a/patches/icedtea-hotspot7-build-fixes.patch Tue May 27 20:01:27 2008 +0100
+++ b/patches/icedtea-hotspot7-build-fixes.patch Tue May 27 20:24:02 2008 +0100
@@ -1,7 +1,7 @@ diff -r 2323cafebabe openjdk/hotspot/src
-diff -r 2323cafebabe openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-01-31 09:19:01.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-29 13:12:39.000000000 -0500
-@@ -86,16 +86,12 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 00:56:04.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 20:14:16.000000000 +0100
+@@ -88,16 +88,12 @@
#define VMLP ""
#endif
@@ -18,47 +18,3 @@ diff -r 2323cafebabe openjdk/hotspot/src
#ifndef HOTSPOT_VM_DISTRO
#error HOTSPOT_VM_DISTRO must be defined
-diff -r 848a72e3bc9b openjdk/hotspot/build/linux/makefiles/top.make
---- openjdk/hotspot/build/linux/makefiles/top.make Fri Feb 29 17:02:22 2008 +0000
-+++ openjdk/hotspot/build/linux/makefiles/top.make Fri Feb 29 17:04:07 2008 +0000
-@@ -67,7 +67,9 @@ Include_DBs/GC = $(VM)/includeD
- $(VM)/gc_implementation/includeDB_gc_serial \
- $(VM)/gc_implementation/includeDB_gc_shared
-
--Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC)
-+Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \
-+ $(VM)/includeDB_jvmti \
-+ $(VM)/includeDB_features
- Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
- Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
- Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
-diff -r 2323cafebabe openjdk/hotspot/build/linux/makefiles/jvmti.make
---- openjdk/hotspot/build/linux/makefiles/jvmti.make 2008-02-29 16:50:25.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/jvmti.make 2008-02-29 10:21:43.000000000 +0000
-@@ -36,6 +36,7 @@
- JvmtiOutDir = $(GENERATED)/jvmtifiles
-
- JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims
-+InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter
- Src_Dirs += $(JvmtiSrcDir)
-
- # set VPATH so make knows where to look for source files
-@@ -47,6 +48,7 @@
- jvmtiEnter.cpp \
- jvmtiEnterTrace.cpp \
- jvmtiEnvRecommended.cpp\
-+ bytecodeInterpreterWithChecks.cpp \
- jvmti.h \
-
- JvmtiEnvFillSource = $(JvmtiSrcDir)/jvmtiEnvFill.java
-@@ -77,6 +79,10 @@
- @echo Generating $@
- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
-
-+$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
-+ @echo Generating $@
-+ $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
-+
- $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
- @echo Generating $@
- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
diff -r c67694e0e00b -r 837336085669 patches/icedtea-override.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-override.patch Tue May 27 20:24:02 2008 +0100
@@ -0,0 +1,19 @@
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:27:49.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/management/AttributeValueExp.java 2008-05-26 19:28:38.000000000 +0100
+@@ -113,7 +113,6 @@
+ * @exception BadBinaryOpValueExpException
+ *
+ */
+- @Override
+ public ValueExp apply(ObjectName name) throws BadStringOperationException, BadBinaryOpValueExpException,
+ BadAttributeValueExpException, InvalidApplicationException {
+ Object result = getAttribute(name);
+@@ -150,7 +149,6 @@
+ evaluted an AttributeValueExp can only appear inside a QueryExp,
+ and that QueryExp will itself have done setMBeanServer. */
+ @Deprecated
+- @Override
+ public void setMBeanServer(MBeanServer s) {
+ }
+
More information about the distro-pkg-dev
mailing list