IcedTea6 merged

[Andrew John Hughes]

Just completed another merge of IcedTea6 to IcedTea7

remote: added 52 changesets with 180 changes to 80 files

A busy two weeks or so since 1.3.1 was released :)

Local changes are just a recreation of Omair's linker patch (applied
with fuzz) and a readaptation of mjw's testenv patch to work with the
equivalent, TestUtil, in OpenJDK7.

2008-11-17  Andrew John Hughes  <ahughes at redhat.com>

        Merge with IcedTea6.
        * .hgignore,
        * .hgtags,
        * ChangeLog,
        * HACKING,
        * IcedTeaPlugin.cc,
        * Makefile.am,
        * contrib/mixtec-hacks.patch,
        * fsg.sh,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java,
        * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
        * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
        * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java,
        * patches/icedtea-6761856-freetypescaler.patch,
        * patches/icedtea-alsa-default-device.patch,
        * patches/icedtea-cc-interp-no-fer.patch,
        * patches/icedtea-display-mode-changer.patch,
        * patches/icedtea-f2i-overflow.patch: Merged.
        * patches/icedtea-linker-libs-order.patch: Rebuilt.
        * patches/icedtea-testenv.patch: Converted to work against TestUtil.
        * patches/icedtea-uname.patch,
        * patches/icedtea-visualvm.patch,
        * plugin/icedtea/sun/applet/PluginAppletViewer.java,
        * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp,
        * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp,
        * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp,
        * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
        * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp,
        * ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
        * ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
        * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
        * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java,
        * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c,
        * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java,
        * test/jtreg/README,
        * test/jtreg/com/sun/javatest/diff/Diff.java,
        * test/jtreg/com/sun/javatest/diff/Fault.java,
        * test/jtreg/com/sun/javatest/diff/HTMLReporter.java,
        * test/jtreg/com/sun/javatest/diff/HTMLWriter.java,
        * test/jtreg/com/sun/javatest/diff/Main.java,
        * test/jtreg/com/sun/javatest/diff/MultiMap.java,
        * test/jtreg/com/sun/javatest/diff/ReportReader.java,
        * test/jtreg/com/sun/javatest/diff/StandardDiff.java,
        * test/jtreg/com/sun/javatest/diff/SuperDiff.java,
        * test/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java,
        * test/jtreg/com/sun/javatest/diff/i18n.properties,
        * test/jtreg/com/sun/javatest/regtest/Main.java,
        * test/jtreg/com/sun/javatest/regtest/MainAction.java,
        * test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java,
        * test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java,
        * test/jtreg/com/sun/javatest/regtest/i18n.properties: Merged.


-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8