Mercurial > hg > release > icedtea6-1.9
changeset 1351:fb3c68368b7f
Merge.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 19 Jan 2009 14:25:02 +0000 |
| parents | f42c98fdd7f4 (current diff) 3a265e06dc74 (diff) |
| children | 913512a256bd |
| files | ChangeLog Makefile.am patches/icedtea-a11y-property-change.patch |
| diffstat | 6 files changed, 41 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 19 14:23:34 2009 +0000 +++ b/ChangeLog Mon Jan 19 14:25:02 2009 +0000 @@ -27,6 +27,28 @@ * patches/icedtea-nio2.patch: Add hook for SharedSecrets to NetworkInterface, extend sun.nio.ch.{Net,DatagramChannelImpl,SelectorProviderImpl} to handle 1.7 extensions. +2009-01-17 Mark Wielaard <mark@klomp.org> + + * patches/icedtea-version.patch (samejvmsafe): Removed the following + directories that contain test that are not samevm safe. + javax/crypto/Cipher (TestGetInstance) + javax/naming (CompareToEqualsTests) + sun/rmi (RmicDefault) + sun/security/util (OidFormat) + sun/security/x509 + (ExtensibleAlgorithmId,EmailAddressEncoding,AllAttribs) + +2009-01-15 Omair Majid <omajid@redhat.com> + + * patches/icedtea-a11y-property-change.patch: Removed incorrect patch. + * HACKING: Remove above patch. + * Makefile.am (ICEDTEA_PATCHES): Removed patch. + +2009-01-15 Gary Benson <gbenson@redhat.com> + + * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp + (StackShadowPages): Increase for 64-bit builds. + 2009-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java:
--- a/HACKING Mon Jan 19 14:23:34 2009 +0000 +++ b/HACKING Mon Jan 19 14:25:02 2009 +0000 @@ -78,7 +78,6 @@ * icedtea-format-warnings.patch: Fix build failures with -Wformat=1. * icedtea-io_util-overflow.patch: Replace some code to correctly handle overflows. (S6788196) * icedtea-cc-interp-jvmti.patch: Disable some JVMTI capabilities which are unsupported or do not work with the C++ interpreter. -* icedtea-a11y-property-change.patch: Dont fire PropertyChangeEvent if the property hasnt changed. * icedtea-demo-swingapplet.patch: Add missing html file needed to run the demo. * icedtea-6791168.patch: Fix build failure with GCC-4.4 (PR 38725) and compiler warnings. * icedtea-no-precompiled.patch: Don't use precompiled header files in hotspot.
--- a/Makefile.am Mon Jan 19 14:23:34 2009 +0000 +++ b/Makefile.am Mon Jan 19 14:25:02 2009 +0000 @@ -695,7 +695,6 @@ ICEDTEA_PATCHES += \ $(DISTRIBUTION_PATCHES) \ - patches/icedtea-a11y-property-change.patch \ patches/icedtea-demo-swingapplet.patch \ patches/icedtea-awt-window-size.patch
--- a/patches/icedtea-a11y-property-change.patch Mon Jan 19 14:23:34 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ ---- AccessibleContext.java.orig 2008-12-24 11:33:22.000000000 -0500 -+++ openjdk/jdk/src/share/classes/javax/accessibility/AccessibleContext.java 2008-12-24 11:35:29.000000000 -0500 -@@ -736,6 +736,14 @@ - Object oldValue, - Object newValue) { - if (accessibleChangeSupport != null) { -+ -+ if (oldValue == newValue) { -+ return; -+ } -+ if (oldValue != null && newValue != null && oldValue.equals(newValue)) { -+ return; -+ } -+ - if (newValue instanceof PropertyChangeEvent) { - PropertyChangeEvent pce = (PropertyChangeEvent)newValue; - accessibleChangeSupport.firePropertyChange(pce);
--- a/patches/icedtea-samejvm-safe.patch Mon Jan 19 14:23:34 2009 +0000 +++ b/patches/icedtea-samejvm-safe.patch Mon Jan 19 14:25:02 2009 +0000 @@ -9,4 +9,4 @@ +# -samejvm mode. Only used if the test root (dir containing this file) is +# given to jtreg and the -samejvm argument is used, ignored otherwise +# (meaning all tests are assumed to be same jvm safe). -+samejvmsafe=com/sun/crypto com/sun/management com/sun/media com/sun/security java/beans/beancontext java/beans/PropertyChangeSupport java/beans/Statement java/beans/VetoableChangeSupport java/lang/Boolean java/lang/Byte java/lang/Double java/lang/Float java/lang/Integer java/lang/Long java/lang/Short java/lang/Math java/lang/StrictMath java/lang/String java/lang/Throwable java/lang/instrument java/math java/net/URI java/net/URLDecoder java/net/URLEncoder java/nio/Buffer java/nio/ByteOrder java/nio/MappedByteBuffer java/nio/channels/Channels java/nio/channels/DatagramChannel java/nio/channels/spi java/security/cert java/security/Provider java/text java/util/jar java/util/zip java/util/Array java/util/BitSet java/util/Collection java/util/List javax/crypto/Cipher javax/imageio javax/management/openmbean javax/naming javax/rmi javax/sound sun/net/www/protocol sun/misc sun/nio sun/rmi sun/security/pkcs11 sun/security/rsa sun/security/util sun/security/x509 sun/util ++samejvmsafe=com/sun/crypto com/sun/management com/sun/media com/sun/security java/beans/beancontext java/beans/PropertyChangeSupport java/beans/Statement java/beans/VetoableChangeSupport java/lang/Boolean java/lang/Byte java/lang/Double java/lang/Float java/lang/Integer java/lang/Long java/lang/Short java/lang/Math java/lang/StrictMath java/lang/String java/lang/Throwable java/lang/instrument java/math java/net/URI java/net/URLDecoder java/net/URLEncoder java/nio/Buffer java/nio/ByteOrder java/nio/MappedByteBuffer java/nio/channels/Channels java/nio/channels/DatagramChannel java/nio/channels/spi java/security/cert java/security/Provider java/text java/util/jar java/util/zip java/util/Array java/util/BitSet java/util/Collection java/util/List javax/imageio javax/management/openmbean javax/rmi javax/sound sun/net/www/protocol sun/misc sun/nio sun/security/pkcs11 sun/security/rsa sun/util
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Mon Jan 19 14:23:34 2009 +0000 +++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp Mon Jan 19 14:25:02 2009 +0000 @@ -1,6 +1,6 @@ /* * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2007 Red Hat, Inc. + * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,27 +28,27 @@ // runtime system. See globals.hpp for details of what they do. // -define_pd_global(bool, ConvertSleepToYield, true); -define_pd_global(bool, ShareVtableStubs, true); -define_pd_global(bool, CountInterpCalls, true); -define_pd_global(bool, NeedsDeoptSuspend, false); +define_pd_global(bool, ConvertSleepToYield, true); +define_pd_global(bool, ShareVtableStubs, true); +define_pd_global(bool, CountInterpCalls, true); +define_pd_global(bool, NeedsDeoptSuspend, false); -define_pd_global(bool, ImplicitNullChecks, true); -define_pd_global(bool, UncommonNullCast, true); +define_pd_global(bool, ImplicitNullChecks, true); +define_pd_global(bool, UncommonNullCast, true); -define_pd_global(intx, CodeEntryAlignment, 32); -define_pd_global(uintx, TLABSize, 0); +define_pd_global(intx, CodeEntryAlignment, 32); +define_pd_global(uintx, TLABSize, 0); #ifdef _LP64 -define_pd_global(uintx, NewSize, ScaleForWordSize(2048 * K)); +define_pd_global(uintx, NewSize, ScaleForWordSize(2048 * K)); #else -define_pd_global(uintx, NewSize, ScaleForWordSize(1024 * K)); +define_pd_global(uintx, NewSize, ScaleForWordSize(1024 * K)); #endif // _LP64 -define_pd_global(intx, InlineFrequencyCount, 100); -define_pd_global(intx, PreInflateSpin, 10); +define_pd_global(intx, InlineFrequencyCount, 100); +define_pd_global(intx, PreInflateSpin, 10); -define_pd_global(intx, StackYellowPages, 2); -define_pd_global(intx, StackRedPages, 1); -define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+3)); +define_pd_global(intx, StackYellowPages, 2); +define_pd_global(intx, StackRedPages, 1); +define_pd_global(intx, StackShadowPages, 3 LP64_ONLY(+3) DEBUG_ONLY(+3)); -define_pd_global(bool, RewriteBytecodes, true); -define_pd_global(bool, RewriteFrequentPairs, true); +define_pd_global(bool, RewriteBytecodes, true); +define_pd_global(bool, RewriteFrequentPairs, true);