/hg/icedtea6: 2 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Wed May 18 06:54:14 PDT 2011
changeset aa99e0230f34 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=aa99e0230f34
author: Denis Lila <dlila at redhat.com>
date: Wed May 18 08:58:20 2011 -0400
Let AWT know about Mutter as a window manager.
changeset 9cd3b8769614 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9cd3b8769614
author: Denis Lila <dlila at redhat.com>
date: Wed May 18 09:04:01 2011 -0400
merge
diffstat:
ChangeLog | 35 +
Makefile.am | 8 +-
NEWS | 1 +
patches/ecj/javafiles.patch | 150 +++++++
patches/javafiles.patch | 150 -------
patches/linux-separate-debuginfo.patch | 376 --------------------
patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 ++
patches/openjdk/mutter.patch | 307 ++++++++++++++++
patches/shark-llvm-2.9.patch | 28 -
patches/tools.patch | 79 ----
10 files changed, 540 insertions(+), 637 deletions(-)
diffs (truncated from 1284 to 500 lines):
diff -r c59c4a788187 -r 9cd3b8769614 ChangeLog
--- a/ChangeLog Tue May 17 09:15:25 2011 +0200
+++ b/ChangeLog Wed May 18 09:04:01 2011 -0400
@@ -1,3 +1,38 @@
+2011-05-17 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Apply patch.
+ * NEWS: Update with backport.
+ * patches/openjdk/mutter.patch: Add Mutter as a window manager,
+ so that a WM specific workaround keeps working.
+
+2011-05-17 Omair Majid <omajid at redhat.com>
+
+ * patches/linux-separate-debuginfo.patch: Remove unapplied patch. An
+ improved version of this patch (which allows running jmap -heap) without
+ debuginfo packages is already included in openjdk6.
+
+2011-05-17 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch.
+ * patches/tools.patch: Remove file. Not required anymore.
+
+2011-05-17 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_PATCHES): Replace patches/shark-llvm-2.9.patch with
+ patches/openjdk/7036220-shark_llvm_29_headers.patch.
+ * patches/shark-llvm-2.9.patch: Move to...
+ * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains
+ contents of patches/shark-llvm-2.9.patch as well as hg metadata.
+
+2011-05-17 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_PATCHES): Move patches/javafiles.patch to ...
+ (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch.
+ * patches/javafiles.patch: Move to...
+ * patches/ecj/javafiles.patch: New file.
+
2011-05-17 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/jtreg-6929067-fix.patch: Fix bashism.
diff -r c59c4a788187 -r 9cd3b8769614 Makefile.am
--- a/Makefile.am Tue May 17 09:15:25 2011 +0200
+++ b/Makefile.am Wed May 18 09:04:01 2011 -0400
@@ -218,14 +218,12 @@
patches/version-hotspot.patch \
patches/hotspot/$(HSBUILD)/text-relocations.patch \
patches/openjdk/7043921-java_rmi_cgi.patch \
- patches/tools.patch \
patches/use-system-tzdata.patch \
patches/headers.patch \
patches/gcc-suffix.patch \
patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
patches/memory-limits.patch \
patches/libraries.patch \
- patches/javafiles.patch \
patches/jvmtiEnv.patch \
patches/lcms.patch \
patches/print_lsb_release.patch \
@@ -334,13 +332,14 @@
patches/revert-6885123.patch \
patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
patches/openjdk/7031385-gcc-register-allocation-fix.patch \
- patches/shark-llvm-2.9.patch \
+ patches/openjdk/7036220-shark_llvm_29_headers.patch \
patches/openjdk/6986968-crash_on_xim_restart.patch \
patches/openjdk/7036754-stroker-nan.patch \
patches/openjdk/pgram-pipe-regression.patch \
patches/openjdk/7034464-hugepage.patch \
patches/openjdk/7037939-hugepage.patch \
- patches/openjdk/7043564-hugepage.patch
+ patches/openjdk/7043564-hugepage.patch \
+ patches/openjdk/mutter.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -417,6 +416,7 @@
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
patches/ecj/hotspot.patch \
patches/ecj/endorsed-dir-for-jvmti.patch \
+ patches/ecj/javafiles.patch \
patches/ecj/spp.patch \
patches/ecj/jopt.patch \
patches/ecj/jaxp-dependency.patch \
diff -r c59c4a788187 -r 9cd3b8769614 NEWS
--- a/NEWS Tue May 17 09:15:25 2011 +0200
+++ b/NEWS Wed May 18 09:04:01 2011 -0400
@@ -28,6 +28,7 @@
- S7036754: Stroked quads sometimes contain NaN
- S7042040: Remove disk space sanity check
- S7043054: REGRESSION - wrong userBounds in Paint.createContext()
+ - S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is.
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
diff -r c59c4a788187 -r 9cd3b8769614 patches/ecj/javafiles.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/javafiles.patch Wed May 18 09:04:01 2011 -0400
@@ -0,0 +1,157 @@
+--- openjdk-ecj/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200
++++ openjdk-ecj/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200
+@@ -29,6 +29,80 @@
+ # will generate header files
+ #
+ JAVA_JAVA_java = \
++ java/lang/reflect/AccessibleObject.java \
++ java/lang/reflect/AnnotatedElement.java \
++ java/lang/reflect/Array.java \
++ java/lang/reflect/Constructor.java \
++ java/lang/reflect/Field.java \
++ java/lang/reflect/GenericArrayType.java \
++ java/lang/reflect/GenericDeclaration.java \
++ java/lang/reflect/GenericSignatureFormatError.java \
++ java/lang/reflect/InvocationHandler.java \
++ java/lang/reflect/InvocationTargetException.java \
++ java/lang/reflect/MalformedParameterizedTypeException.java \
++ java/lang/reflect/Member.java \
++ java/lang/reflect/Method.java \
++ java/lang/reflect/Modifier.java \
++ java/lang/reflect/package-info.java \
++ java/lang/reflect/ParameterizedType.java \
++ java/lang/reflect/Proxy.java \
++ java/lang/reflect/ReflectAccess.java \
++ java/lang/reflect/ReflectPermission.java \
++ java/lang/reflect/Type.java \
++ java/lang/reflect/TypeVariable.java \
++ java/lang/reflect/UndeclaredThrowableException.java \
++ java/lang/reflect/WildcardType.java \
++ java/lang/ref/Finalizer.java \
++ java/lang/ref/FinalReference.java \
++ java/lang/ref/PhantomReference.java \
++ java/lang/ref/Reference.java \
++ java/lang/ref/ReferenceQueue.java \
++ java/lang/ref/SoftReference.java \
++ java/lang/ref/WeakReference.java \
++ java/lang/management/ClassLoadingMXBean.java \
++ java/lang/management/CompilationMXBean.java \
++ java/lang/management/GarbageCollectorMXBean.java \
++ java/lang/management/LockInfo.java \
++ java/lang/management/ManagementFactory.java \
++ java/lang/management/ManagementPermission.java \
++ java/lang/management/MemoryManagerMXBean.java \
++ java/lang/management/MemoryMXBean.java \
++ java/lang/management/MemoryNotificationInfo.java \
++ java/lang/management/MemoryPoolMXBean.java \
++ java/lang/management/MemoryType.java \
++ java/lang/management/MemoryUsage.java \
++ java/lang/management/MonitorInfo.java \
++ java/lang/management/OperatingSystemMXBean.java \
++ java/lang/management/RuntimeMXBean.java \
++ java/lang/management/ThreadInfo.java \
++ java/lang/management/ThreadMXBean.java \
++ java/lang/instrument/ClassDefinition.java \
++ java/lang/instrument/ClassFileTransformer.java \
++ java/lang/instrument/IllegalClassFormatException.java \
++ java/lang/instrument/Instrumentation.java \
++ java/lang/instrument/UnmodifiableClassException.java \
++ java/lang/annotation/AnnotationFormatError.java \
++ java/lang/annotation/Annotation.java \
++ java/lang/annotation/AnnotationTypeMismatchException.java \
++ java/lang/annotation/Documented.java \
++ java/lang/annotation/ElementType.java \
++ java/lang/annotation/IncompleteAnnotationException.java \
++ java/lang/annotation/Inherited.java \
++ java/lang/annotation/package-info.java \
++ java/lang/annotation/Retention.java \
++ java/lang/annotation/RetentionPolicy.java \
++ java/lang/annotation/Target.java \
++ java/io/IOError.java \
++ java/lang/Deprecated.java \
++ java/lang/Iterable.java \
++ java/util/RandomAccess.java \
++ java/lang/CharacterData00.java \
++ java/lang/CharacterData01.java \
++ java/lang/CharacterData02.java \
++ java/lang/CharacterData0E.java \
++ java/lang/CharacterDataLatin1.java \
++ java/lang/CharacterDataPrivateUse.java \
++ java/lang/CharacterDataUndefined.java \
+ java/lang/Object.java \
+ java/lang/Class.java \
+ java/lang/Thread.java \
+@@ -135,13 +209,6 @@
+ java/lang/Readable.java \
+ java/lang/Override.java \
+ java/lang/SuppressWarnings.java \
+- java/lang/ref/Reference.java \
+- java/lang/ref/SoftReference.java \
+- java/lang/ref/WeakReference.java \
+- java/lang/ref/FinalReference.java \
+- java/lang/ref/PhantomReference.java \
+- java/lang/ref/ReferenceQueue.java \
+- java/lang/ref/Finalizer.java \
+ java/util/BitSet.java \
+ java/util/Calendar.java \
+ java/util/GregorianCalendar.java \
+--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200
+@@ -62,7 +62,6 @@
+ com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \
+ com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \
+ com/sun/corba/se/impl/encoding/TypeCodeReader.java \
+- com/sun/corba/se/impl/encoding/WrapperInputStream.java
+-
+-
+-
++ com/sun/corba/se/impl/encoding/WrapperInputStream.java \
++ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \
++ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
+--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200
+@@ -29,5 +29,6 @@
+ com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
+ com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
++ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
+ com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
+
+--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200
+@@ -81,5 +81,5 @@
+ com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \
+ com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \
+ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \
+- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java
+-
++ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \
++ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java
+--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200
+@@ -30,6 +30,7 @@
+ com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \
+ com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \
+ com/sun/corba/se/spi/monitoring/MonitoringFactories.java \
++ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \
+ com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \
+ com/sun/corba/se/spi/monitoring/MonitoredObject.java \
+ com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \
+--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200
+@@ -66,4 +66,5 @@
+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
+ com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \
+ com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
+- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
++ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \
++ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java
+--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200
+@@ -81,4 +81,5 @@
+ com/sun/corba/se/impl/orbutil/graph/Node.java \
+ com/sun/corba/se/impl/orbutil/graph/NodeData.java \
+ com/sun/corba/se/impl/orbutil/graph/Graph.java \
+- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java
++ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \
++ com/sun/corba/se/impl/orbutil/GetPropertyAction.java
diff -r c59c4a788187 -r 9cd3b8769614 patches/javafiles.patch
--- a/patches/javafiles.patch Tue May 17 09:15:25 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
---- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200
-+++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200
-@@ -29,6 +29,80 @@
- # will generate header files
- #
- JAVA_JAVA_java = \
-+ java/lang/reflect/AccessibleObject.java \
-+ java/lang/reflect/AnnotatedElement.java \
-+ java/lang/reflect/Array.java \
-+ java/lang/reflect/Constructor.java \
-+ java/lang/reflect/Field.java \
-+ java/lang/reflect/GenericArrayType.java \
-+ java/lang/reflect/GenericDeclaration.java \
-+ java/lang/reflect/GenericSignatureFormatError.java \
-+ java/lang/reflect/InvocationHandler.java \
-+ java/lang/reflect/InvocationTargetException.java \
-+ java/lang/reflect/MalformedParameterizedTypeException.java \
-+ java/lang/reflect/Member.java \
-+ java/lang/reflect/Method.java \
-+ java/lang/reflect/Modifier.java \
-+ java/lang/reflect/package-info.java \
-+ java/lang/reflect/ParameterizedType.java \
-+ java/lang/reflect/Proxy.java \
-+ java/lang/reflect/ReflectAccess.java \
-+ java/lang/reflect/ReflectPermission.java \
-+ java/lang/reflect/Type.java \
-+ java/lang/reflect/TypeVariable.java \
-+ java/lang/reflect/UndeclaredThrowableException.java \
-+ java/lang/reflect/WildcardType.java \
-+ java/lang/ref/Finalizer.java \
-+ java/lang/ref/FinalReference.java \
-+ java/lang/ref/PhantomReference.java \
-+ java/lang/ref/Reference.java \
-+ java/lang/ref/ReferenceQueue.java \
-+ java/lang/ref/SoftReference.java \
-+ java/lang/ref/WeakReference.java \
-+ java/lang/management/ClassLoadingMXBean.java \
-+ java/lang/management/CompilationMXBean.java \
-+ java/lang/management/GarbageCollectorMXBean.java \
-+ java/lang/management/LockInfo.java \
-+ java/lang/management/ManagementFactory.java \
-+ java/lang/management/ManagementPermission.java \
-+ java/lang/management/MemoryManagerMXBean.java \
-+ java/lang/management/MemoryMXBean.java \
-+ java/lang/management/MemoryNotificationInfo.java \
-+ java/lang/management/MemoryPoolMXBean.java \
-+ java/lang/management/MemoryType.java \
-+ java/lang/management/MemoryUsage.java \
-+ java/lang/management/MonitorInfo.java \
-+ java/lang/management/OperatingSystemMXBean.java \
-+ java/lang/management/RuntimeMXBean.java \
-+ java/lang/management/ThreadInfo.java \
-+ java/lang/management/ThreadMXBean.java \
-+ java/lang/instrument/ClassDefinition.java \
-+ java/lang/instrument/ClassFileTransformer.java \
-+ java/lang/instrument/IllegalClassFormatException.java \
-+ java/lang/instrument/Instrumentation.java \
-+ java/lang/instrument/UnmodifiableClassException.java \
-+ java/lang/annotation/AnnotationFormatError.java \
-+ java/lang/annotation/Annotation.java \
-+ java/lang/annotation/AnnotationTypeMismatchException.java \
-+ java/lang/annotation/Documented.java \
-+ java/lang/annotation/ElementType.java \
-+ java/lang/annotation/IncompleteAnnotationException.java \
-+ java/lang/annotation/Inherited.java \
-+ java/lang/annotation/package-info.java \
-+ java/lang/annotation/Retention.java \
-+ java/lang/annotation/RetentionPolicy.java \
-+ java/lang/annotation/Target.java \
-+ java/io/IOError.java \
-+ java/lang/Deprecated.java \
-+ java/lang/Iterable.java \
-+ java/util/RandomAccess.java \
-+ java/lang/CharacterData00.java \
-+ java/lang/CharacterData01.java \
-+ java/lang/CharacterData02.java \
-+ java/lang/CharacterData0E.java \
-+ java/lang/CharacterDataLatin1.java \
-+ java/lang/CharacterDataPrivateUse.java \
-+ java/lang/CharacterDataUndefined.java \
- java/lang/Object.java \
- java/lang/Class.java \
- java/lang/Thread.java \
-@@ -135,13 +209,6 @@
- java/lang/Readable.java \
- java/lang/Override.java \
- java/lang/SuppressWarnings.java \
-- java/lang/ref/Reference.java \
-- java/lang/ref/SoftReference.java \
-- java/lang/ref/WeakReference.java \
-- java/lang/ref/FinalReference.java \
-- java/lang/ref/PhantomReference.java \
-- java/lang/ref/ReferenceQueue.java \
-- java/lang/ref/Finalizer.java \
- java/util/BitSet.java \
- java/util/Calendar.java \
- java/util/GregorianCalendar.java \
---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200
-+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200
-@@ -62,7 +62,6 @@
- com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \
- com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \
- com/sun/corba/se/impl/encoding/TypeCodeReader.java \
-- com/sun/corba/se/impl/encoding/WrapperInputStream.java
--
--
--
-+ com/sun/corba/se/impl/encoding/WrapperInputStream.java \
-+ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \
-+ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200
-+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200
-@@ -29,5 +29,6 @@
- com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
- com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
- com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
-+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
- com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
-
---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200
-+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200
-@@ -81,5 +81,5 @@
- com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \
- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \
-- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java
--
-+ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \
-+ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java
---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200
-+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200
-@@ -30,6 +30,7 @@
- com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \
- com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \
- com/sun/corba/se/spi/monitoring/MonitoringFactories.java \
-+ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \
- com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \
- com/sun/corba/se/spi/monitoring/MonitoredObject.java \
- com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \
---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200
-+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200
-@@ -66,4 +66,5 @@
- com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
- com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \
- com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
-- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
-+ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \
-+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java
---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200
-+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200
-@@ -81,4 +81,5 @@
- com/sun/corba/se/impl/orbutil/graph/Node.java \
- com/sun/corba/se/impl/orbutil/graph/NodeData.java \
- com/sun/corba/se/impl/orbutil/graph/Graph.java \
-- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java
-+ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \
-+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java
diff -r c59c4a788187 -r 9cd3b8769614 patches/linux-separate-debuginfo.patch
--- a/patches/linux-separate-debuginfo.patch Tue May 17 09:15:25 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,379 +0,0 @@
-2009-12-09 Andrew Haley <aph at redhat.com>
-
- * openjdk/hotspot/agent/src/os/linux/symtab.c (debug_file_directory):
- New variable.
- (gnu_debuglink_crc32): New.
- (build_symtab_internal): Rename from build_symtab, make static.
- Add logic to look inside debuginfo files.
- (open_debug_file, find_section_by_name, open_file_from_debug_link,
- build_id_to_debug_filename, build_symtab_from_build_id,
- build_symtab): New.
- * openjdk/hotspot/agent/src/os/linux/libproc_impl.c (add_lib_info_fd):
- Pass FILENAME to build_symtab().
- * openjdk/hotspot/agent/src/os/linux/symtab.h (build_symtab):
- Add FILENAME arg.
-
-2009-12-16 Andrew Haley <aph at redhat.com>
-
- * openjdk/hotspot/agent/src/os/linux/symtab.c (open_file_from_debug_link):
- Check for NULL.
- Fix off by one error in aligning the CRC: the offset is 4 bytes,
- not 3.
-
-diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/libproc_impl.c openjdk/hotspot/agent/src/os/linux/libproc_impl.c
---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/libproc_impl.c 2009-05-15 00:36:38.000000000 +0100
-+++ openjdk/hotspot/agent/src/os/linux/libproc_impl.c 2009-12-04 16:29:27.552837905 +0000
-@@ -174,7 +174,7 @@
- return NULL;
- }
-
-- newlib->symtab = build_symtab(newlib->fd);
-+ newlib->symtab = build_symtab(newlib->fd, libname);
- if (newlib->symtab == NULL) {
- print_debug("symbol table build failed for %s\n", newlib->name);
- }
-diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.h openjdk/hotspot/agent/src/os/linux/symtab.h
---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.h 2009-05-15 00:36:38.000000000 +0100
-+++ openjdk/hotspot/agent/src/os/linux/symtab.h 2009-12-04 16:30:38.797838015 +0000
-@@ -32,7 +32,7 @@
- struct symtab;
-
- // build symbol table for a given ELF file descriptor
--struct symtab* build_symtab(int fd);
-+struct symtab* build_symtab(int fd, const char *filename);
-
- // destroy the symbol table
- void destroy_symtab(struct symtab* symtab);
-
---- openjdk/hotspot/agent/src/os/linux/symtab.c 2009-12-16 17:13:28.879599584 +0000
-+++ openjdk/hotspot/agent/src/os/linux/symtab.c 2009-12-16 17:14:15.871601226 +0000
-@@ -53,8 +53,274 @@
- struct hsearch_data *hash_table;
- } symtab_t;
-
--// read symbol table from given fd.
--struct symtab* build_symtab(int fd) {
-+
-+// Directory that contains global debuginfo files. In theory it
-+// should be possible to change this, but in a Java environment there
-+// is no obvious place to put a user interface to do it. Maybe this
-+// could be set with an environment variable.
-+static const char debug_file_directory[] = "/usr/lib/debug";
-+
-+/* The CRC used in gnu_debuglink, retrieved from
-+ http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. */
-+unsigned long gnu_debuglink_crc32 (unsigned long crc,
-+ unsigned char *buf, size_t len)
-+{
-+ static const unsigned long crc32_table[256] =
-+ {
-+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
-+ 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
-+ 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
-+ 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
-+ 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
-+ 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
More information about the distro-pkg-dev
mailing list