/hg/icedtea7-forest/jdk: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Aug 11 15:40:28 UTC 2014
changeset 4b26f93b23ba in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4b26f93b23ba
author: goetz
date: Mon Jul 07 12:45:48 2014 +0200
Merge
changeset 8246cc40b4cf in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=8246cc40b4cf
author: goetz
date: Tue Jul 15 14:56:58 2014 +0200
Adapt AIX port to 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
changeset c8f2b525a839 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=c8f2b525a839
author: andrew
date: Mon Aug 11 16:38:08 2014 +0100
Merge PPC64 port
diffstat:
.hgtags | 59 +
.jcheck/conf | 2 -
make/bridge/AccessBridgeJava/Makefile | 6 +-
make/bridge/Jabswitch/Makefile | 7 +-
make/com/apple/osxui/Makefile | 1 +
make/com/oracle/Makefile | 18 +-
make/com/sun/java/pack/Makefile | 7 +-
make/com/sun/jmx/Makefile | 10 +-
make/com/sun/nio/sctp/Exportedfiles.gmk | 4 +-
make/com/sun/nio/sctp/FILES_c.gmk | 4 +-
make/com/sun/nio/sctp/FILES_java.gmk | 16 +-
make/com/sun/nio/sctp/Makefile | 21 +-
make/com/sun/security/auth/module/Makefile | 4 -
make/common/Defs-embedded.gmk | 8 +-
make/common/Defs-linux.gmk | 42 +-
make/common/Defs-macosx.gmk | 15 +-
make/common/Defs.gmk | 24 +-
make/common/Demo.gmk | 2 +-
make/common/Library.gmk | 42 +-
make/common/Program.gmk | 91 +-
make/common/Release.gmk | 44 +-
make/common/internal/Resources.gmk | 4 +
make/common/shared/Compiler-gcc.gmk | 76 +-
make/common/shared/Defs-java.gmk | 21 +-
make/common/shared/Defs-versions.gmk | 2 +-
make/common/shared/Defs.gmk | 2 +-
make/common/shared/Platform.gmk | 13 +-
make/common/shared/Sanity.gmk | 8 +
make/docs/Makefile | 6 +-
make/java/instrument/Makefile | 6 +-
make/java/java/Exportedfiles.gmk | 1 +
make/java/java/FILES_c.gmk | 1 -
make/java/java/Makefile | 43 +
make/java/java/mapfile-vers | 4 +-
make/java/java/reorder-i586 | 1 -
make/java/java/reorder-sparc | 1 -
make/java/java/reorder-sparcv9 | 1 -
make/java/main/java/mapfile-aarch64 | 39 +
make/java/net/FILES_c.gmk | 7 +
make/java/net/Makefile | 26 +-
make/java/nio/Makefile | 266 +-
make/java/security/Makefile | 12 +-
make/java/sun_nio/Makefile | 2 +-
make/java/version/Makefile | 5 +
make/javax/sound/SoundDefs.gmk | 68 +-
make/jdk_generic_profile.sh | 181 +-
make/sun/Makefile | 2 +-
make/sun/awt/FILES_c_unix.gmk | 10 +
make/sun/awt/Makefile | 2 +-
make/sun/awt/mawt.gmk | 40 +-
make/sun/cmm/lcms/FILES_c_unix.gmk | 7 +-
make/sun/cmm/lcms/Makefile | 8 +-
make/sun/font/Makefile | 15 +-
make/sun/gtk/FILES_c_unix.gmk | 41 +
make/sun/gtk/FILES_export_unix.gmk | 31 +
make/sun/gtk/Makefile | 82 +
make/sun/gtk/mapfile-vers | 72 +
make/sun/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/africa | 53 +-
make/sun/javazic/tzdata/antarctica | 41 +-
make/sun/javazic/tzdata/asia | 55 +-
make/sun/javazic/tzdata/australasia | 42 +-
make/sun/javazic/tzdata/europe | 72 +-
make/sun/javazic/tzdata/leapseconds | 2 +-
make/sun/javazic/tzdata/northamerica | 15 +-
make/sun/javazic/tzdata/southamerica | 19 +-
make/sun/javazic/tzdata/zone.tab | 3 +-
make/sun/jawt/Makefile | 7 +
make/sun/jpeg/FILES_c.gmk | 6 +-
make/sun/jpeg/Makefile | 11 +-
make/sun/lwawt/FILES_c_macosx.gmk | 6 +
make/sun/lwawt/FILES_export_macosx.gmk | 3 +-
make/sun/lwawt/Makefile | 7 +-
make/sun/native2ascii/Makefile | 2 +-
make/sun/net/FILES_java.gmk | 229 +-
make/sun/nio/cs/Makefile | 14 +-
make/sun/security/Makefile | 11 +-
make/sun/security/ec/Makefile | 27 +-
make/sun/security/jgss/wrapper/Makefile | 2 +-
make/sun/security/krb5/Makefile | 10 +-
make/sun/security/krb5/internal/ccache/Makefile | 49 +
make/sun/security/mscapi/Makefile | 2 +-
make/sun/security/pkcs11/Makefile | 6 +-
make/sun/security/pkcs11/mapfile-vers | 4 +-
make/sun/security/smartcardio/Makefile | 17 +-
make/sun/splashscreen/FILES_c.gmk | 78 +-
make/sun/splashscreen/Makefile | 35 +-
make/sun/xawt/FILES_c_unix.gmk | 25 +-
make/sun/xawt/FILES_export_unix.gmk | 3 +-
make/sun/xawt/Makefile | 58 +-
make/sun/xawt/mapfile-vers | 37 -
make/tools/Makefile | 9 +
make/tools/freetypecheck/Makefile | 4 +-
make/tools/generate_nimbus/Makefile | 1 +
make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java | 22 +-
make/tools/src/build/tools/compileproperties/CompileProperties.java | 9 +-
make/tools/src/build/tools/dirdiff/DirDiff.java | 4 +-
make/tools/src/build/tools/dtdbuilder/DTDBuilder.java | 34 +-
make/tools/src/build/tools/dtdbuilder/DTDInputStream.java | 6 +-
make/tools/src/build/tools/dtdbuilder/DTDParser.java | 44 +-
make/tools/src/build/tools/dtdbuilder/PublicMapping.java | 6 +-
make/tools/src/build/tools/generatebreakiteratordata/CharSet.java | 16 +-
make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java | 8 +-
make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java | 6 +-
make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java | 201 +-
make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java | 6 +-
make/tools/src/build/tools/generatecharacter/GenerateCharacter.java | 4 +-
make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java | 147 +-
make/tools/src/build/tools/generatecharacter/UnicodeSpec.java | 22 +-
make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 4 +-
make/tools/src/build/tools/hasher/Hasher.java | 38 +-
make/tools/src/build/tools/jarsplit/JarSplit.java | 5 +-
make/tools/src/build/tools/javazic/Gen.java | 14 +-
make/tools/src/build/tools/javazic/GenDoc.java | 16 +-
make/tools/src/build/tools/javazic/Main.java | 3 +-
make/tools/src/build/tools/javazic/Simple.java | 23 +-
make/tools/src/build/tools/javazic/Time.java | 10 +-
make/tools/src/build/tools/javazic/Zoneinfo.java | 18 +-
make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java | 7 +-
make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java | 7 +-
make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java | 14 +-
make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java | 26 +-
make/tools/src/build/tools/jdwpgen/AltNode.java | 4 +-
make/tools/src/build/tools/jdwpgen/CommandSetNode.java | 11 +-
make/tools/src/build/tools/jdwpgen/ConstantSetNode.java | 9 +-
make/tools/src/build/tools/jdwpgen/ErrorSetNode.java | 9 +-
make/tools/src/build/tools/jdwpgen/Node.java | 25 +-
make/tools/src/build/tools/jdwpgen/OutNode.java | 14 +-
make/tools/src/build/tools/jdwpgen/RootNode.java | 10 +-
make/tools/src/build/tools/jdwpgen/SelectNode.java | 10 +-
make/tools/src/build/tools/makeclasslist/MakeClasslist.java | 15 +-
make/tools/src/build/tools/stripproperties/StripProperties.java | 4 +-
src/macosx/classes/sun/font/CFontManager.java | 23 +-
src/macosx/classes/sun/font/CStrike.java | 110 +-
src/macosx/classes/sun/lwawt/LWToolkit.java | 26 +-
src/macosx/classes/sun/lwawt/LWWindowPeer.java | 155 +-
src/macosx/classes/sun/lwawt/PlatformWindow.java | 4 +-
src/macosx/classes/sun/lwawt/macosx/CClipboard.java | 2 +-
src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java | 71 +-
src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java | 3 +-
src/macosx/classes/sun/lwawt/macosx/CInputMethod.java | 15 +-
src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java | 45 -
src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java | 7 +-
src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java | 7 +-
src/macosx/classes/sun/lwawt/macosx/CPlatformView.java | 2 +-
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 25 +-
src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java | 2 +-
src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java | 7 +-
src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java | 41 +-
src/macosx/classes/sun/lwawt/macosx/event/NSEvent.java | 10 +-
src/macosx/classes/sun/nio/ch/SctpChannelImpl.java | 150 +
src/macosx/classes/sun/nio/ch/SctpMultiChannelImpl.java | 137 +
src/macosx/classes/sun/nio/ch/SctpServerChannelImpl.java | 102 +
src/macosx/native/sun/awt/AWTEvent.m | 2 +-
src/macosx/native/sun/awt/AWTView.h | 8 +-
src/macosx/native/sun/awt/AWTView.m | 41 +-
src/macosx/native/sun/awt/AWTWindow.m | 103 +-
src/macosx/native/sun/awt/CDropTarget.m | 5 +-
src/macosx/native/sun/awt/JavaComponentAccessibility.m | 25 +-
src/macosx/native/sun/awt/JavaTextAccessibility.m | 10 +
src/macosx/native/sun/awt/LWCToolkit.m | 4 +-
src/macosx/native/sun/awt/awt.m | 12 +-
src/macosx/native/sun/font/AWTStrike.h | 7 +-
src/macosx/native/sun/font/AWTStrike.m | 10 +-
src/macosx/native/sun/font/CGGlyphImages.m | 17 +-
src/macosx/native/sun/osxapp/ThreadUtilities.h | 4 +-
src/macosx/native/sun/osxapp/ThreadUtilities.m | 27 +-
src/share/bin/java.c | 8 +-
src/share/bin/wildcard.c | 5 +
src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties | 4 +-
src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java | 16 +-
src/share/classes/com/sun/beans/finder/ConstructorFinder.java | 27 +-
src/share/classes/com/sun/beans/finder/MethodFinder.java | 29 +-
src/share/classes/com/sun/beans/finder/Signature.java | 12 +
src/share/classes/com/sun/beans/finder/SignatureException.java | 41 +
src/share/classes/com/sun/beans/util/Cache.java | 613 +
src/share/classes/com/sun/crypto/provider/RSACipher.java | 61 +-
src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java | 21 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +-
src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties | 4 +-
src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java | 131 +
src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java | 131 +
src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 +
src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java | 20 +-
src/share/classes/com/sun/jndi/dns/DnsClient.java | 101 +-
src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +-
src/share/classes/com/sun/jndi/ldap/Connection.java | 6 +-
src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java | 21 +-
src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java | 22 +-
src/share/classes/com/sun/media/sound/JDK13Services.java | 129 +-
src/share/classes/com/sun/media/sound/JSSecurityManager.java | 2 +-
src/share/classes/com/sun/naming/internal/ResourceManager.java | 57 +-
src/share/classes/com/sun/rowset/CachedRowSetImpl.java | 23 +-
src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties | 2 +-
src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties | 6 +-
src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties | 10 +-
src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java | 13 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +-
src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 2 +-
src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java | 3 +-
src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties | 4 +-
src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties | 4 +-
src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties | 4 +-
src/share/classes/java/awt/Component.java | 2 +-
src/share/classes/java/awt/EventQueue.java | 8 +-
src/share/classes/java/awt/KeyboardFocusManager.java | 5 +-
src/share/classes/java/awt/Toolkit.java | 2 +-
src/share/classes/java/awt/color/ICC_Profile.java | 4 +-
src/share/classes/java/awt/datatransfer/SystemFlavorMap.java | 63 +-
src/share/classes/java/awt/event/InvocationEvent.java | 94 +-
src/share/classes/java/awt/event/MouseEvent.java | 3 +-
src/share/classes/java/beans/IndexedPropertyDescriptor.java | 44 +-
src/share/classes/java/beans/MethodDescriptor.java | 26 +-
src/share/classes/java/beans/MethodRef.java | 87 +
src/share/classes/java/beans/PropertyDescriptor.java | 48 +-
src/share/classes/java/io/InputStream.java | 2 +-
src/share/classes/java/io/ObjectOutputStream.java | 4 +-
src/share/classes/java/lang/AbstractStringBuilder.java | 4 +-
src/share/classes/java/lang/Class.java | 291 +-
src/share/classes/java/lang/ClassValue.java | 13 +-
src/share/classes/java/lang/ConditionalSpecialCasing.java | 6 +-
src/share/classes/java/lang/String.java | 11 +-
src/share/classes/java/lang/System.java | 12 +-
src/share/classes/java/lang/Thread.java | 3 +-
src/share/classes/java/lang/invoke/BoundMethodHandle.java | 83 +-
src/share/classes/java/lang/invoke/DirectMethodHandle.java | 3 +-
src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java | 3 +-
src/share/classes/java/lang/invoke/MethodHandleImpl.java | 3 +-
src/share/classes/java/lang/invoke/MethodHandles.java | 2 +
src/share/classes/java/lang/ref/Finalizer.java | 44 +-
src/share/classes/java/net/IDN.java | 40 +-
src/share/classes/java/net/SocksSocketImpl.java | 4 +-
src/share/classes/java/nio/charset/Charset.java | 56 +-
src/share/classes/java/nio/file/Files.java | 8 +-
src/share/classes/java/security/Policy.java | 1 -
src/share/classes/java/util/ComparableTimSort.java | 2 +-
src/share/classes/java/util/ServiceLoader.java | 2 +-
src/share/classes/java/util/TimSort.java | 2 +-
src/share/classes/java/util/jar/JarFile.java | 13 +-
src/share/classes/java/util/jar/JarVerifier.java | 20 +-
src/share/classes/java/util/logging/LogManager.java | 128 +-
src/share/classes/java/util/logging/Logger.java | 43 +-
src/share/classes/javax/accessibility/AccessibleContext.java | 23 +
src/share/classes/javax/crypto/Cipher.java | 172 +-
src/share/classes/javax/crypto/JceSecurity.java | 34 +-
src/share/classes/javax/script/ScriptEngineManager.java | 24 +-
src/share/classes/javax/security/auth/Subject.java | 22 +-
src/share/classes/javax/sql/rowset/RowSetProvider.java | 26 +-
src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java | 13 +-
src/share/classes/javax/sql/rowset/spi/SyncFactory.java | 48 +-
src/share/classes/javax/swing/JComboBox.java | 22 +
src/share/classes/javax/swing/JComponent.java | 24 +-
src/share/classes/javax/swing/JDialog.java | 3 +-
src/share/classes/javax/swing/JEditorPane.java | 11 +-
src/share/classes/javax/swing/JFrame.java | 10 +-
src/share/classes/javax/swing/JInternalFrame.java | 6 +-
src/share/classes/javax/swing/JPopupMenu.java | 24 +-
src/share/classes/javax/swing/JTable.java | 37 +-
src/share/classes/javax/swing/JTree.java | 51 +-
src/share/classes/javax/swing/MenuSelectionManager.java | 12 +-
src/share/classes/javax/swing/PopupFactory.java | 14 +-
src/share/classes/javax/swing/SwingUtilities.java | 3 +-
src/share/classes/javax/swing/SwingWorker.java | 2 +-
src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 6 +-
src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +-
src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 16 +-
src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 8 +-
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +-
src/share/classes/javax/swing/plaf/nimbus/skin.laf | 12 +-
src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +-
src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +-
src/share/classes/javax/swing/text/JTextComponent.java | 6 +-
src/share/classes/javax/swing/text/html/parser/Parser.java | 9 +-
src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 -
src/share/classes/sun/applet/AppletPanel.java | 10 +-
src/share/classes/sun/applet/AppletViewerPanel.java | 18 +-
src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java | 10 +-
src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java | 2 +-
src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java | 2 +-
src/share/classes/sun/awt/AWTAccessor.java | 65 +-
src/share/classes/sun/awt/AWTAutoShutdown.java | 20 +-
src/share/classes/sun/awt/AppContext.java | 94 +-
src/share/classes/sun/awt/FontConfiguration.java | 4 +-
src/share/classes/sun/awt/SunToolkit.java | 3 +-
src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java | 5 +-
src/share/classes/sun/awt/datatransfer/DataTransferer.java | 52 +-
src/share/classes/sun/awt/datatransfer/SunClipboard.java | 12 +-
src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java | 9 +-
src/share/classes/sun/awt/image/ByteBandedRaster.java | 20 +-
src/share/classes/sun/awt/image/ByteComponentRaster.java | 20 +-
src/share/classes/sun/awt/image/BytePackedRaster.java | 19 +-
src/share/classes/sun/awt/image/FileImageSource.java | 4 +
src/share/classes/sun/awt/image/IntegerComponentRaster.java | 20 +-
src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +-
src/share/classes/sun/awt/image/ShortBandedRaster.java | 19 +-
src/share/classes/sun/awt/image/ShortComponentRaster.java | 20 +-
src/share/classes/sun/awt/resources/awt_pt_BR.properties | 8 +-
src/share/classes/sun/font/CreatedFontTracker.java | 46 +-
src/share/classes/sun/font/SunFontManager.java | 35 +-
src/share/classes/sun/java2d/Disposer.java | 32 +-
src/share/classes/sun/java2d/SunGraphics2D.java | 2 +
src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +-
src/share/classes/sun/java2d/opengl/OGLRenderQueue.java | 10 +-
src/share/classes/sun/launcher/resources/launcher_de.properties | 2 +-
src/share/classes/sun/launcher/resources/launcher_pt_BR.properties | 6 +-
src/share/classes/sun/management/resources/agent_ja.properties | 2 +-
src/share/classes/sun/misc/InnocuousThread.java | 121 +
src/share/classes/sun/misc/JavaAWTAccess.java | 14 +-
src/share/classes/sun/misc/JavaLangAccess.java | 17 +-
src/share/classes/sun/misc/Service.java | 2 +-
src/share/classes/sun/misc/SharedSecrets.java | 10 +-
src/share/classes/sun/misc/ThreadGroupUtils.java | 55 +
src/share/classes/sun/misc/VM.java | 17 +-
src/share/classes/sun/misc/Version.java.template | 58 +-
src/share/classes/sun/net/www/http/ChunkedOutputStream.java | 2 +-
src/share/classes/sun/net/www/http/HttpClient.java | 4 +
src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java | 31 +-
src/share/classes/sun/nio/ch/Invoker.java | 12 +
src/share/classes/sun/nio/ch/ThreadPool.java | 35 +-
src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider | 2 -
src/share/classes/sun/reflect/annotation/AnnotationParser.java | 67 +-
src/share/classes/sun/reflect/annotation/AnnotationType.java | 69 +-
src/share/classes/sun/rmi/registry/RegistryImpl.java | 14 +
src/share/classes/sun/rmi/server/LoaderHandler.java | 2 +-
src/share/classes/sun/rmi/server/UnicastServerRef.java | 2 +-
src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java | 142 +-
src/share/classes/sun/security/krb5/Credentials.java | 17 +-
src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java | 96 +-
src/share/classes/sun/security/pkcs11/Config.java | 3 +
src/share/classes/sun/security/pkcs11/P11Cipher.java | 388 +-
src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +-
src/share/classes/sun/security/pkcs11/P11RSACipher.java | 154 +-
src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java | 44 +-
src/share/classes/sun/security/pkcs11/P11Util.java | 2 +-
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 23 +-
src/share/classes/sun/security/pkcs11/Token.java | 34 +
src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +-
src/share/classes/sun/security/provider/SeedGenerator.java | 31 +-
src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java | 2 +-
src/share/classes/sun/security/provider/certpath/ForwardBuilder.java | 26 +-
src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +-
src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java | 20 +
src/share/classes/sun/security/rsa/RSAPadding.java | 131 +-
src/share/classes/sun/security/smartcardio/CardImpl.java | 2 +-
src/share/classes/sun/security/ssl/RSAClientKeyExchange.java | 166 +-
src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 +
src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java | 2 +-
src/share/classes/sun/security/tools/JarSigner.java | 20 +-
src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java | 4 +-
src/share/classes/sun/security/util/KeyUtil.java | 76 +-
src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +-
src/share/classes/sun/security/util/SignatureFileVerifier.java | 46 +
src/share/classes/sun/swing/DefaultLookup.java | 3 +-
src/share/classes/sun/swing/SwingUtilities2.java | 22 +-
src/share/classes/sun/tools/jar/Main.java | 2 +-
src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties | 2 +-
src/share/classes/sun/tools/jconsole/Messages.java | 7 +-
src/share/classes/sun/tools/jconsole/SummaryTab.java | 4 +-
src/share/classes/sun/tools/jconsole/ThreadTab.java | 5 +-
src/share/classes/sun/tools/jconsole/VMPanel.java | 4 +-
src/share/classes/sun/tools/jconsole/resources/messages.properties | 7 +-
src/share/classes/sun/tools/jconsole/resources/messages_ja.properties | 20 +-
src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties | 8 +-
src/share/classes/sun/tools/native2ascii/Main.java | 9 +-
src/share/classes/sun/util/calendar/ZoneInfoFile.java | 41 +-
src/share/classes/sun/util/logging/resources/logging_zh_TW.properties | 2 +-
src/share/classes/sun/util/resources/TimeZoneNames.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_de.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_es.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_it.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 8 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 8 +-
src/share/demo/jvmti/gctest/sample.makefile.txt | 6 +-
src/share/demo/jvmti/heapTracker/sample.makefile.txt | 19 +-
src/share/demo/jvmti/heapViewer/sample.makefile.txt | 5 +-
src/share/demo/jvmti/hprof/sample.makefile.txt | 6 +-
src/share/demo/jvmti/minst/sample.makefile.txt | 19 +-
src/share/demo/jvmti/mtrace/sample.makefile.txt | 20 +-
src/share/demo/jvmti/versionCheck/sample.makefile.txt | 6 +-
src/share/demo/jvmti/waiters/sample.makefile.txt | 8 +-
src/share/instrument/JarFacade.c | 4 +-
src/share/instrument/Reentrancy.c | 2 +
src/share/lib/security/java.security-linux | 4 +
src/share/lib/security/java.security-macosx | 4 +
src/share/lib/security/java.security-solaris | 4 +
src/share/lib/security/java.security-windows | 4 +
src/share/lib/security/nss.cfg.in | 5 +
src/share/lib/security/sunpkcs11-solaris.cfg | 14 +-
src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 37 +-
src/share/native/com/sun/java/util/jar/pack/zip.cpp | 2 +-
src/share/native/com/sun/media/sound/SoundDefs.h | 9 +
src/share/native/java/lang/Class.c | 13 +
src/share/native/java/lang/ref/Finalizer.c | 42 -
src/share/native/java/util/zip/Deflater.c | 46 +-
src/share/native/java/util/zip/Inflater.c | 6 +-
src/share/native/sun/awt/giflib/dgif_lib.c | 4 +-
src/share/native/sun/awt/image/awt_ImageRep.c | 2 +-
src/share/native/sun/awt/image/gif/gifdecoder.c | 1 +
src/share/native/sun/awt/image/jpeg/README | 385 -
src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 16 +-
src/share/native/sun/awt/image/jpeg/jcapimin.c | 284 -
src/share/native/sun/awt/image/jpeg/jcapistd.c | 165 -
src/share/native/sun/awt/image/jpeg/jccoefct.c | 453 -
src/share/native/sun/awt/image/jpeg/jccolor.c | 462 -
src/share/native/sun/awt/image/jpeg/jcdctmgr.c | 391 -
src/share/native/sun/awt/image/jpeg/jchuff.c | 913 --
src/share/native/sun/awt/image/jpeg/jchuff.h | 51 -
src/share/native/sun/awt/image/jpeg/jcinit.c | 76 -
src/share/native/sun/awt/image/jpeg/jcmainct.c | 297 -
src/share/native/sun/awt/image/jpeg/jcmarker.c | 682 -
src/share/native/sun/awt/image/jpeg/jcmaster.c | 594 -
src/share/native/sun/awt/image/jpeg/jcomapi.c | 110 -
src/share/native/sun/awt/image/jpeg/jconfig.h | 43 -
src/share/native/sun/awt/image/jpeg/jcparam.c | 614 -
src/share/native/sun/awt/image/jpeg/jcphuff.c | 837 --
src/share/native/sun/awt/image/jpeg/jcprepct.c | 358 -
src/share/native/sun/awt/image/jpeg/jcsample.c | 523 -
src/share/native/sun/awt/image/jpeg/jctrans.c | 392 -
src/share/native/sun/awt/image/jpeg/jdapimin.c | 399 -
src/share/native/sun/awt/image/jpeg/jdapistd.c | 279 -
src/share/native/sun/awt/image/jpeg/jdcoefct.c | 740 -
src/share/native/sun/awt/image/jpeg/jdcolor.c | 398 -
src/share/native/sun/awt/image/jpeg/jdct.h | 180 -
src/share/native/sun/awt/image/jpeg/jddctmgr.c | 273 -
src/share/native/sun/awt/image/jpeg/jdhuff.c | 655 -
src/share/native/sun/awt/image/jpeg/jdhuff.h | 205 -
src/share/native/sun/awt/image/jpeg/jdinput.c | 385 -
src/share/native/sun/awt/image/jpeg/jdmainct.c | 516 -
src/share/native/sun/awt/image/jpeg/jdmarker.c | 1384 ---
src/share/native/sun/awt/image/jpeg/jdmaster.c | 561 -
src/share/native/sun/awt/image/jpeg/jdmerge.c | 404 -
src/share/native/sun/awt/image/jpeg/jdphuff.c | 672 -
src/share/native/sun/awt/image/jpeg/jdpostct.c | 294 -
src/share/native/sun/awt/image/jpeg/jdsample.c | 482 -
src/share/native/sun/awt/image/jpeg/jdtrans.c | 147 -
src/share/native/sun/awt/image/jpeg/jerror.c | 272 -
src/share/native/sun/awt/image/jpeg/jerror.h | 295 -
src/share/native/sun/awt/image/jpeg/jfdctflt.c | 172 -
src/share/native/sun/awt/image/jpeg/jfdctfst.c | 228 -
src/share/native/sun/awt/image/jpeg/jfdctint.c | 287 -
src/share/native/sun/awt/image/jpeg/jidctflt.c | 246 -
src/share/native/sun/awt/image/jpeg/jidctfst.c | 372 -
src/share/native/sun/awt/image/jpeg/jidctint.c | 393 -
src/share/native/sun/awt/image/jpeg/jidctred.c | 402 -
src/share/native/sun/awt/image/jpeg/jinclude.h | 95 -
src/share/native/sun/awt/image/jpeg/jmemmgr.c | 1124 --
src/share/native/sun/awt/image/jpeg/jmemnobs.c | 113 -
src/share/native/sun/awt/image/jpeg/jmemsys.h | 202 -
src/share/native/sun/awt/image/jpeg/jmorecfg.h | 378 -
src/share/native/sun/awt/image/jpeg/jpeg-6b/README | 385 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c | 284 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c | 165 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c | 453 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c | 462 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c | 391 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c | 913 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h | 51 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c | 76 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c | 297 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c | 682 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c | 594 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c | 110 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h | 43 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c | 614 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c | 837 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c | 358 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c | 523 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c | 392 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c | 399 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c | 279 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c | 740 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c | 398 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h | 180 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c | 273 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c | 655 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h | 205 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c | 385 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c | 516 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c | 1390 +++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c | 561 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c | 404 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c | 672 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c | 294 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c | 482 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c | 147 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c | 272 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h | 295 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c | 172 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c | 228 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c | 287 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c | 246 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c | 372 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c | 393 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c | 402 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h | 95 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c | 1124 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c | 113 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h | 202 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h | 378 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h | 396 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h | 1100 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c | 860 ++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c | 1314 +++
src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c | 183 +
src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h | 18 +
src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 5 +-
src/share/native/sun/awt/image/jpeg/jpegint.h | 396 -
src/share/native/sun/awt/image/jpeg/jpeglib.h | 1100 --
src/share/native/sun/awt/image/jpeg/jquant1.c | 860 --
src/share/native/sun/awt/image/jpeg/jquant2.c | 1314 ---
src/share/native/sun/awt/image/jpeg/jutils.c | 183 -
src/share/native/sun/awt/image/jpeg/jversion.h | 18 -
src/share/native/sun/awt/libpng/pngrtran.c | 3 +
src/share/native/sun/awt/libpng/pngset.c | 11 +
src/share/native/sun/awt/medialib/awt_ImagingLib.c | 82 +-
src/share/native/sun/awt/splashscreen/splashscreen_gif.c | 11 +-
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +-
src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +-
src/share/native/sun/font/freetypeScaler.c | 206 +-
src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp | 1 +
src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 7 +-
src/share/native/sun/font/layout/LigatureSubstProc2.cpp | 6 +-
src/share/native/sun/font/layout/LookupProcessor.cpp | 1 +
src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 1 +
src/share/native/sun/font/layout/OpenTypeUtilities.cpp | 2 +-
src/share/native/sun/font/layout/SegmentArrayProcessor.cpp | 1 +
src/share/native/sun/font/layout/StateTableProcessor.cpp | 1 +
src/share/native/sun/java2d/cmm/lcms/cmscam02.c | 4 +-
src/share/native/sun/java2d/cmm/lcms/cmscgats.c | 61 +-
src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c | 99 +-
src/share/native/sun/java2d/cmm/lcms/cmserr.c | 2 -
src/share/native/sun/java2d/cmm/lcms/cmsgamma.c | 59 +-
src/share/native/sun/java2d/cmm/lcms/cmsgmt.c | 54 +-
src/share/native/sun/java2d/cmm/lcms/cmsintrp.c | 69 +-
src/share/native/sun/java2d/cmm/lcms/cmsio0.c | 167 +-
src/share/native/sun/java2d/cmm/lcms/cmsio1.c | 242 +-
src/share/native/sun/java2d/cmm/lcms/cmslut.c | 89 +-
src/share/native/sun/java2d/cmm/lcms/cmsmd5.c | 2 +-
src/share/native/sun/java2d/cmm/lcms/cmsnamed.c | 52 +-
src/share/native/sun/java2d/cmm/lcms/cmsopt.c | 107 +-
src/share/native/sun/java2d/cmm/lcms/cmspack.c | 24 +-
src/share/native/sun/java2d/cmm/lcms/cmspcs.c | 4 +
src/share/native/sun/java2d/cmm/lcms/cmsplugin.c | 47 +-
src/share/native/sun/java2d/cmm/lcms/cmsps2.c | 5 +-
src/share/native/sun/java2d/cmm/lcms/cmssamp.c | 246 +-
src/share/native/sun/java2d/cmm/lcms/cmstypes.c | 264 +-
src/share/native/sun/java2d/cmm/lcms/cmsvirt.c | 191 +-
src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c | 66 +-
src/share/native/sun/java2d/cmm/lcms/cmsxform.c | 29 +-
src/share/native/sun/java2d/cmm/lcms/lcms2.h | 18 +-
src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h | 28 +-
src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h | 6 +-
src/share/native/sun/java2d/loops/TransformHelper.c | 11 +-
src/share/native/sun/java2d/opengl/OGLContext.c | 2 +
src/share/native/sun/management/Flag.c | 4 +-
src/share/native/sun/management/GcInfoBuilder.c | 15 +-
src/share/native/sun/security/ec/ECC_JNI.cpp | 12 +-
src/share/native/sun/security/ec/ecc_impl.h | 297 +
src/share/native/sun/security/ec/impl/ecc_impl.h | 270 -
src/share/native/sun/security/jgss/wrapper/GSSLibStub.c | 185 +-
src/share/native/sun/security/jgss/wrapper/NativeUtil.c | 17 +-
src/share/native/sun/security/krb5/nativeccache.c | 29 +-
src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 42 +-
src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c | 12 +-
src/share/native/sun/security/pkcs11/wrapper/p11_digest.c | 7 +-
src/share/native/sun/security/pkcs11/wrapper/p11_dual.c | 8 +-
src/share/native/sun/security/pkcs11/wrapper/p11_general.c | 17 +-
src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c | 4 +-
src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c | 58 +-
src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c | 4 +-
src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c | 14 +-
src/share/native/sun/security/pkcs11/wrapper/p11_sign.c | 27 +-
src/share/native/sun/security/pkcs11/wrapper/p11_util.c | 90 +-
src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h | 9 +-
src/share/native/sun/security/smartcardio/pcsc.c | 195 +-
src/share/npt/npt.h | 8 +-
src/share/npt/utf.c | 2 +-
src/solaris/bin/aarch64/jvm.cfg | 36 +
src/solaris/bin/java_md_solinux.c | 2 +
src/solaris/classes/java/lang/UNIXProcess.java.aix | 441 +-
src/solaris/classes/java/lang/UNIXProcess.java.bsd | 102 +-
src/solaris/classes/java/lang/UNIXProcess.java.linux | 104 +-
src/solaris/classes/java/lang/UNIXProcess.java.solaris | 70 +-
src/solaris/classes/sun/awt/UNIXToolkit.java | 6 +
src/solaris/classes/sun/awt/X11/XClipboard.java | 4 +-
src/solaris/classes/sun/awt/X11/XErrorHandler.java | 2 +-
src/solaris/classes/sun/awt/X11/XFramePeer.java | 5 +
src/solaris/classes/sun/awt/X11/XNETProtocol.java | 29 +-
src/solaris/classes/sun/awt/X11/XToolkit.java | 27 +-
src/solaris/classes/sun/awt/X11/XWM.java | 26 +-
src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 +
src/solaris/classes/sun/awt/X11GraphicsDevice.java | 28 +-
src/solaris/classes/sun/font/FcFontConfiguration.java | 19 +-
src/solaris/classes/sun/net/PortConfig.java | 7 +
src/solaris/classes/sun/nio/fs/UnixPath.java | 2 +-
src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java | 4 +-
src/solaris/demo/jni/Poller/Poller.c | 12 +-
src/solaris/javavm/export/jni_md.h | 18 +-
src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c | 2 +-
src/solaris/native/com/sun/security/auth/module/Solaris.c | 17 +-
src/solaris/native/com/sun/security/auth/module/Unix.c | 102 +-
src/solaris/native/common/deps/cups_fp.c | 104 +
src/solaris/native/common/deps/cups_fp.h | 61 +
src/solaris/native/common/deps/fontconfig2/fontconfig/fontconfig.h | 302 +
src/solaris/native/common/deps/fontconfig2/fontconfig_fp.c | 208 +
src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h | 161 +
src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 +
src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 +
src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 +
src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 65 +
src/solaris/native/common/deps/glib2/gio_fp.c | 109 +
src/solaris/native/common/deps/glib2/gio_fp.h | 61 +
src/solaris/native/common/deps/glib2/glib_fp.h | 41 +
src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 +
src/solaris/native/common/deps/gtk2/gtk_fp.c | 370 +
src/solaris/native/common/deps/gtk2/gtk_fp.h | 468 +
src/solaris/native/common/deps/gtk2/gtk_fp_check.c | 54 +
src/solaris/native/common/deps/gtk2/gtk_fp_check.h | 30 +
src/solaris/native/common/deps/syscalls_fp.c | 122 +
src/solaris/native/common/deps/syscalls_fp.h | 79 +
src/solaris/native/java/lang/ProcessEnvironment_md.c | 23 +-
src/solaris/native/java/lang/UNIXProcess_md.c | 739 +-
src/solaris/native/java/lang/childproc.c | 376 +
src/solaris/native/java/lang/childproc.h | 145 +
src/solaris/native/java/lang/java_props_macosx.c | 14 +-
src/solaris/native/java/lang/java_props_macosx.h | 1 +
src/solaris/native/java/lang/java_props_md.c | 35 +-
src/solaris/native/java/lang/jspawnhelper.c | 149 +
src/solaris/native/java/net/NetworkInterface.c | 4 +-
src/solaris/native/java/net/PlainDatagramSocketImpl.c | 24 +-
src/solaris/native/java/net/PlainSocketImpl.c | 3 +-
src/solaris/native/java/net/SocketInputStream.c | 2 +
src/solaris/native/java/net/bsd_close.c | 29 +-
src/solaris/native/java/net/linux_close.c | 22 +-
src/solaris/native/java/util/FileSystemPreferences.c | 26 +-
src/solaris/native/java/util/TimeZone_md.c | 64 +
src/solaris/native/sun/awt/CUPSfuncs.c | 137 +-
src/solaris/native/sun/awt/awt_GTKToolkit.c | 228 +
src/solaris/native/sun/awt/awt_GraphicsEnv.c | 45 +-
src/solaris/native/sun/awt/awt_LoadLibrary.c | 10 +-
src/solaris/native/sun/awt/awt_UNIXToolkit.c | 199 -
src/solaris/native/sun/awt/awt_util.c | 10 +
src/solaris/native/sun/awt/awt_util.h | 74 +-
src/solaris/native/sun/awt/awt_wm.c | 146 +-
src/solaris/native/sun/awt/fontconfig.h | 941 --
src/solaris/native/sun/awt/fontpath.c | 420 +-
src/solaris/native/sun/awt/gtk2_interface.c | 987 +-
src/solaris/native/sun/awt/gtk2_interface.h | 588 +-
src/solaris/native/sun/awt/gtk2_interface_check.c | 34 +
src/solaris/native/sun/awt/gtk2_interface_check.h | 42 +
src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 68 +-
src/solaris/native/sun/awt/swing_GTKEngine.c | 76 +-
src/solaris/native/sun/awt/swing_GTKStyle.c | 20 +-
src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c | 28 +-
src/solaris/native/sun/java2d/x11/X11SurfaceData.c | 6 +-
src/solaris/native/sun/net/spi/DefaultProxySelector.c | 465 +-
src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 -
src/solaris/native/sun/nio/ch/SctpChannelImpl.c | 49 +-
src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c | 94 +-
src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c | 50 +-
src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c | 149 +-
src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c | 113 +
src/solaris/native/sun/security/pkcs11/j2secmod_md.c | 11 +-
src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c | 2 +-
src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h | 5 +
src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h | 19 +
src/solaris/native/sun/security/smartcardio/pcsc_md.c | 76 +-
src/solaris/native/sun/security/smartcardio/pcsc_md.h | 40 +
src/solaris/native/sun/xawt/XlibWrapper.c | 5 +
src/solaris/native/sun/xawt/awt_Desktop.c | 103 +-
src/windows/bin/cmdtoargs.c | 76 +-
src/windows/classes/java/lang/ProcessImpl.java | 6 +-
src/windows/classes/java/net/DualStackPlainSocketImpl.java | 5 +-
src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java | 25 +-
src/windows/classes/sun/awt/windows/WClipboard.java | 3 +-
src/windows/classes/sun/awt/windows/WToolkit.java | 36 +-
src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java | 64 +-
src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 6 +-
src/windows/classes/sun/nio/fs/WindowsConstants.java | 1 +
src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java | 14 +-
src/windows/classes/sun/nio/fs/WindowsWatchService.java | 104 +-
src/windows/classes/sun/security/mscapi/RSACipher.java | 83 +-
src/windows/native/java/lang/ProcessImpl_md.c | 398 +-
src/windows/native/java/lang/java_props_md.c | 4 +-
src/windows/native/java/net/NetworkInterface_winXP.c | 16 +-
src/windows/native/java/net/SocketInputStream.c | 52 +-
src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 8 +-
src/windows/native/sun/font/fontpath.c | 26 +-
src/windows/native/sun/nio/ch/SocketDispatcher.c | 67 +-
src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c | 28 +-
src/windows/native/sun/security/krb5/NativeCreds.c | 106 +-
src/windows/native/sun/security/pkcs11/j2secmod_md.c | 4 +-
src/windows/native/sun/security/pkcs11/wrapper/p11_md.h | 4 +
src/windows/native/sun/windows/awt_Component.cpp | 4 +-
src/windows/native/sun/windows/awt_FileDialog.cpp | 4 +-
src/windows/native/sun/windows/awt_Frame.cpp | 2 +
src/windows/native/sun/windows/awt_Toolkit.cpp | 11 +-
src/windows/resource/java.manifest | 10 +-
test/ProblemList.txt | 16 -
test/com/oracle/security/ucrypto/TestAES.java | 118 +-
test/com/oracle/security/ucrypto/TestDigest.java | 24 +-
test/com/oracle/security/ucrypto/TestRSA.java | 276 +-
test/com/oracle/security/ucrypto/UcryptoTest.java | 28 +-
test/com/sun/corba/5036554/JavaBug.java | 37 +
test/com/sun/corba/5036554/README | 77 +
test/com/sun/corba/5036554/TestCorbaBug.sh | 112 +
test/com/sun/corba/5036554/bug.idl | 4 +
test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +-
test/com/sun/crypto/provider/TLS/TestPremaster.java | 55 +-
test/com/sun/jndi/ldap/LdapTimeoutTest.java | 45 +-
test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java | 276 +
test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 +
test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java | 3 +-
test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html | 25 +-
test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java | 17 +-
test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java | 28 +-
test/java/awt/Focus/8013611/JDK8013611.java | 111 +
test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java | 94 +
test/java/awt/Frame/7024749/bug7024749.java | 2 +-
test/java/awt/Frame/ExceptionOnSetExtendedStateTest/ExceptionOnSetExtendedStateTest.java | 104 +
test/java/awt/Graphics2D/DrawString/DrawRotatedString.java | 81 +
test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java | 77 +
test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html | 43 +
test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java | 119 +
test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java | 219 +
test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java | 108 +
test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java | 111 +
test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java | 138 +
test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java | 37 +
test/java/awt/Window/Grab/GrabTest.java | 34 +-
test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java | 133 +
test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java | 128 +
test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java | 9 +-
test/java/awt/font/TextLayout/TestAATMorxFont.java | 86 +
test/java/awt/image/ImageIconHang.java | 48 +
test/java/beans/Introspector/Test7172865.java | 162 +
test/java/beans/Introspector/TestTypeResolver.java | 2 +
test/java/beans/XMLDecoder/8028054/Task.java | 99 +
test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java | 81 +
test/java/beans/XMLDecoder/8028054/TestMethodFinder.java | 81 +
test/java/beans/XMLEncoder/Test8027066.java | 41 +
test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java | 68 +
test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java | 123 +
test/java/lang/Class/checkMemberAccess/test.policy | 6 +
test/java/lang/ClassLoader/Assert.sh | 16 +
test/java/lang/ProcessBuilder/Basic.java | 24 +-
test/java/lang/ProcessBuilder/BasicLauncher.java | 99 +
test/java/lang/ProcessBuilder/CloseRace.java | 182 +
test/java/lang/ProcessBuilder/InheritIO/InheritIO.java | 47 +
test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh | 81 +
test/java/lang/ProcessBuilder/InheritIOEHandle.java | 147 +
test/java/lang/ProcessBuilder/SiblingIOEHandle.java | 205 +
test/java/lang/String/ToLowerCase.java | 7 +-
test/java/lang/System/MacEncoding/ExpectedEncoding.java | 66 +
test/java/lang/System/MacEncoding/MacJNUEncoding.sh | 96 +
test/java/lang/System/MacEncoding/TestFileEncoding.java | 168 +
test/java/lang/System/MacJNUEncoding/ExpectedEncoding.java | 56 -
test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh | 96 -
test/java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java | 101 +
test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java | 187 +
test/java/lang/instrument/DaemonThread/DummyAgent.java | 46 +
test/java/lang/instrument/DaemonThread/DummyClass.java | 27 +
test/java/lang/instrument/DaemonThread/TestDaemonThread.java | 72 +
test/java/lang/instrument/DaemonThread/TestDaemonThreadLauncher.java | 44 +
test/java/lang/invoke/8009222/Test8009222.java | 49 +
test/java/lang/invoke/BigArityTest.java | 2 +-
test/java/lang/invoke/CallSiteTest.java | 2 +-
test/java/lang/invoke/MethodHandlesTest.java | 2 +-
test/java/lang/invoke/RicochetTest.java | 2 +-
test/java/lang/invoke/TestCatchExceptionWithVarargs.java | 97 +
test/java/lang/ref/FinalizeOverride.java | 167 +
test/java/net/Authenticator/B4769350.java | 489 +-
test/java/net/IDN/UseSTD3ASCIIRules.java | 80 +
test/java/net/NetworkInterface/UniqueMacAddressesTest.java | 132 +
test/java/net/ServerSocket/AnotherSelectFdsLimit.java | 78 +
test/java/net/Socket/asyncClose/Race.java | 77 +
test/java/net/URL/TestHttps.java | 34 +
test/java/net/URLClassLoader/closetest/CloseTest.java | 3 +-
test/java/net/URLClassLoader/closetest/Common.java | 37 +-
test/java/net/URLClassLoader/closetest/GetResourceAsStream.java | 2 +
test/java/nio/MappedByteBuffer/Basic.java | 91 +-
test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java | 69 +-
test/java/nio/channels/Selector/ByteServer.java | 68 +-
test/java/nio/channels/Selector/ReadAfterConnect.java | 34 +-
test/java/nio/channels/Selector/SelectAfterRead.java | 92 +-
test/java/nio/channels/Selector/SelectWrite.java | 43 +-
test/java/nio/channels/SocketChannel/ShortWrite.java | 100 +-
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so | Bin
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so | Bin
test/java/nio/file/Files/BytesAndLines.java | 14 +-
test/java/nio/file/Path/PathOps.java | 4 +-
test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +-
test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +-
test/java/rmi/registry/readTest/readTest.sh | 4 +
test/java/rmi/testlibrary/TestLibrary.java | 29 +-
test/java/util/Arrays/TimSortStackSize.java | 123 +
test/java/util/Locale/data/deflocale.rhel5 | 3924 ----------
test/java/util/Locale/data/deflocale.rhel5.fmtasdefault | 3924 ----------
test/java/util/Locale/data/deflocale.sol10 | 1725 ----
test/java/util/Locale/data/deflocale.sol10.fmtasdefault | 1725 ----
test/java/util/Locale/data/deflocale.win7 | 1494 ---
test/java/util/Locale/data/deflocale.win7.fmtasdefault | 1494 ---
test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh | 1 +
test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java | 2 +-
test/java/util/logging/TestAppletLoggerContext.java | 19 +-
test/java/util/logging/TestGetLoggerNPE.java | 91 +
test/java/util/logging/TestLogConfigurationDeadLock.java | 256 +
test/java/util/logging/TestLogConfigurationDeadLockWithConf.java | 340 +
test/java/util/logging/TestLoggerBundleSync.java | 535 +
test/java/util/logging/TestLoggingWithMainAppContext.java | 75 +
test/java/util/logging/TestMainAppContext.java | 85 +
test/java/util/logging/deadlockconf.properties | 22 +
test/java/util/zip/ZipFile/ReadZip.java | 2 +
test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java | 58 +
test/javax/imageio/plugins/jpeg/truncated.jpg | Bin
test/javax/management/monitor/CounterMonitorThresholdTest.java | 21 +-
test/javax/management/monitor/NullAttributeValueTest.java | 68 +-
test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java | 17 +-
test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java | 20 +-
test/javax/swing/JComboBox/8032878/bug8032878.java | 136 +
test/javax/swing/JPopupMenu/7160604/bug7160604.html | 30 +
test/javax/swing/JPopupMenu/7160604/bug7160604.java | 90 +
test/javax/swing/JTable/8032874/bug8032874.java | 145 +
test/javax/swing/JTextField/8036819/bug8036819.java | 132 +
test/javax/swing/plaf/nimbus/8041725/bug8041725.java | 82 +
test/javax/swing/text/GlyphView/4984669/bug4984669.html | 30 +
test/javax/swing/text/GlyphView/4984669/bug4984669.java | 55 +
test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java | 6 +-
test/javax/swing/text/html/parser/Parser/8028616/bug8028616.java | 77 +
test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java | 26 +-
test/javax/xml/jaxp/parsers/8027359/XML11EntityScannerTest.java | 184 +
test/javax/xml/jaxp/parsers/8032909/XSLT.java | 54 +
test/javax/xml/jaxp/parsers/8032909/a_utf16.xml | Bin
test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl | Bin
test/javax/xml/jaxp/parsers/8032909/a_utf8.xml | 5 +
test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl | 13 +
test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml | 5 +
test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl | 13 +
test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml | 2 +
test/javax/xml/jaxp/transform/8004476/TestBase.java | 82 +
test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java | 287 +
test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java | 248 +
test/javax/xml/jaxp/transform/8004476/tokenize.xml | 7 +
test/javax/xml/jaxp/transform/8004476/tokenize.xsl | 30 +
test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java | 60 +
test/javax/xml/jaxp/validation/8015092/idIxpns.xsd | 12 +
test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd | 12 +
test/javax/xml/jaxp/validation/8015092/idJ029.xsd | 21 +
test/javax/xml/jaxp/validation/8015092/idJimp.xsd | 11 +
test/javax/xml/jaxp/validation/8015243/AnyURITest.java | 60 +
test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd | 32 +
test/javax/xml/ws/8033113/Organization_List.wsdl | 99 +
test/javax/xml/ws/8033113/WsImportTest.java | 152 +
test/javax/xml/ws/8033113/customization.xml | 45 +
test/javax/xml/ws/clientjar/TestWsImport.java | 6 +-
test/lib/testlibrary/AssertsTest.java | 237 +
test/lib/testlibrary/ClassFileInstaller.java | 5 +-
test/lib/testlibrary/OutputAnalyzerReportingTest.java | 122 +
test/lib/testlibrary/jdk/testlibrary/Asserts.java | 395 +
test/lib/testlibrary/jdk/testlibrary/FileUtils.java | 194 +
test/lib/testlibrary/jdk/testlibrary/InputArguments.java | 88 +
test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java | 106 +
test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java | 134 +
test/lib/testlibrary/jdk/testlibrary/JcmdBase.java | 47 +-
test/lib/testlibrary/jdk/testlibrary/JdkFinder.java | 78 -
test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java | 157 +-
test/lib/testlibrary/jdk/testlibrary/Platform.java | 103 +
test/lib/testlibrary/jdk/testlibrary/ProcessThread.java | 143 +
test/lib/testlibrary/jdk/testlibrary/ProcessTools.java | 195 +-
test/lib/testlibrary/jdk/testlibrary/StreamPumper.java | 151 +-
test/lib/testlibrary/jdk/testlibrary/TestThread.java | 249 +
test/lib/testlibrary/jdk/testlibrary/Utils.java | 232 +
test/lib/testlibrary/jdk/testlibrary/XRun.java | 56 +
test/sun/awt/AppContext/MultiThread/MultiThreadTest.java | 100 +
test/sun/awt/datatransfer/DataFlavorComparatorTest.java | 46 +
test/sun/awt/dnd/8024061/bug8024061.java | 357 +
test/sun/awt/image/bug8038000.java | 153 +
test/sun/java2d/DrawXORModeTest.java | 110 +
test/sun/management/jmxremote/bootstrap/linux-i586/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-i586/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher | Bin
test/sun/management/windows/revokeall.exe | Bin
test/sun/net/InetAddress/nameservice/dns/cname.sh | 2 +-
test/sun/net/idn/nfscis.spp | Bin
test/sun/net/idn/nfscsi.spp | Bin
test/sun/net/idn/nfscss.spp | Bin
test/sun/net/idn/nfsmxp.spp | Bin
test/sun/net/idn/nfsmxs.spp | Bin
test/sun/net/www/http/HttpClient/B8025710.java | 409 +
test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 +
test/sun/net/www/protocol/jar/jarbug/run.sh | 4 +
test/sun/security/krb5/auto/BadKdc.java | 29 +-
test/sun/security/krb5/auto/BadKdc1.java | 11 +-
test/sun/security/krb5/auto/BadKdc2.java | 7 +-
test/sun/security/krb5/auto/KDC.java | 6 +-
test/sun/security/krb5/auto/LoginNoPass.java | 73 +
test/sun/security/krb5/auto/MaxRetries.java | 8 +-
test/sun/security/krb5/auto/TcpTimeout.java | 141 +-
test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 +
test/sun/security/pkcs11/fips/CipherTest.java | 15 +-
test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java | 12 +-
test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk | Bin
test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnssckbi.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so | Bin
test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll | Bin
test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll | Bin
test/sun/security/pkcs11/tls/TestPremaster.java | 55 +-
test/sun/security/pkcs12/PKCS12SameKeyId.java | 2 +-
test/sun/security/tools/jarsigner/EntriesOrder.java | 204 +
test/sun/security/tools/jarsigner/TimestampCheck.java | 4 +-
test/sun/security/tools/jarsigner/checkusage.sh | 2 +-
test/sun/security/tools/jarsigner/crl.sh | 2 +-
test/sun/security/tools/jarsigner/jvindex.sh | 2 +-
test/sun/security/tools/jarsigner/newsize7.sh | 2 +-
test/sun/security/tools/jarsigner/onlymanifest.sh | 2 +-
test/sun/security/tools/jarsigner/passtype.sh | 2 +-
test/sun/security/tools/jarsigner/samename.sh | 2 +-
test/sun/security/tools/jarsigner/ts.sh | 2 +-
test/sun/security/tools/keytool/CloseFile.java | 2 +-
test/sun/security/tools/keytool/ListKeychainStore.sh | 1 +
test/sun/security/tools/keytool/StartDateTest.java | 2 +-
test/sun/security/tools/keytool/emptysubject.sh | 2 +-
test/sun/security/tools/keytool/importreadall.sh | 2 +-
test/sun/security/tools/keytool/readjar.sh | 2 +-
test/sun/security/tools/keytool/selfissued.sh | 2 +-
test/sun/security/tools/keytool/trystore.sh | 2 +-
test/sun/security/validator/samedn.sh | 2 +-
test/sun/tools/jcmd/help_help.out | 2 +-
test/sun/tools/native2ascii/NativeErrors.java | 4 +-
test/tools/launcher/I18NArgTest.java | 111 +
test/tools/launcher/RunpathTest.java | 84 +
test/tools/pack200/MemoryAllocatorTest.java | 369 +
988 files changed, 56216 insertions(+), 49792 deletions(-)
diffs (truncated from 129823 to 500 lines):
diff -r 6aaf00000bd5 -r c8f2b525a839 .hgtags
--- a/.hgtags Wed Apr 16 01:58:46 2014 +0000
+++ b/.hgtags Mon Aug 11 16:38:08 2014 +0100
@@ -50,6 +50,7 @@
f708138c9aca4b389872838fe6773872fce3609e jdk7-b73
eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74
8885b22565077236a927e824ef450742e434a230 jdk7-b75
+fb2ee5e96b171ae9db67274d87ffaba941e8bfa6 icedtea7-1.12
8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76
e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
@@ -63,6 +64,7 @@
eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
2cafbbe9825e911a6ca6c17d9a18eb1f0bf0873c jdk7-b87
b3c69282f6d3c90ec21056cd1ab70dc0c895b069 jdk7-b88
+2017795af50aebc00f500e58f708980b49bc7cd1 icedtea7-1.13
4a6abb7e224cc8d9a583c23c5782e4668739a119 jdk7-b89
7f90d0b9dbb7ab4c60d0b0233e4e77fb4fac597c jdk7-b90
08a31cab971fcad4695e913d0f3be7bde3a90747 jdk7-b91
@@ -111,6 +113,7 @@
554adcfb615e63e62af530b1c10fcf7813a75b26 jdk7-b134
d8ced728159fbb2caa8b6adb477fd8efdbbdf179 jdk7-b135
aa13e7702cd9d8aca9aa38f1227f966990866944 jdk7-b136
+1571aa7abe47a54510c62a5b59a8c343cdaf67cb icedtea-1.14
29296ea6529a418037ccce95903249665ef31c11 jdk7-b137
60d3d55dcc9c31a30ced9caa6ef5c0dcd7db031d jdk7-b138
d80954a89b49fda47c0c5cace65a17f5a758b8bd jdk7-b139
@@ -123,6 +126,7 @@
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01
f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
+7ec1845521edfb1843cad3868217983727ece53d icedtea-2.0-branchpoint
2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02
a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03
b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04
@@ -141,6 +145,7 @@
79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12
fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13
24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21
+a75913596199fbb8583f9d74021f54dc76f87b14 icedtea-2.1-branchpoint
e3790f3ce50aa4e2a1b03089ac0bcd48f9d1d2c2 jdk7u3-b02
7e8351342f0b22b694bd3c2db979643529f32e71 jdk7u3-b03
fc6b7b6ac837c9e867b073e13fc14e643f771028 jdk7u3-b04
@@ -157,6 +162,7 @@
6485e842d7f736b6ca3d7e4a7cdc5de6bbdd870c jdk7u4-b10
d568e85567ccfdd75f3f0c42aa0d75c440422827 jdk7u4-b11
16781e84dcdb5f82c287a3b5387dde9f8aaf74e0 jdk7u4-b12
+907555f6191a0cd84886b07c4c40bc6ce498b8b1 icedtea-2.2-branchpoint
c929e96aa059c8b79ab94d5b0b1a242ca53a5b32 jdk7u4-b13
09f612bac047b132bb9bf7d4aa8afe6ea4d5b938 jdk7u4-b14
9e15d1f3fa4b35b8c950323c76b9ed094d434b97 jdk7u5-b01
@@ -194,6 +200,7 @@
e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint
4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
@@ -261,6 +268,7 @@
cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07
b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08
2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09
+b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint
e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10
9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11
ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12
@@ -372,6 +380,7 @@
db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
402d54c7d8ce95f3945cc3d698e528e4adec7b9b jdk7u45-b33
34e8f9f26ae612ebac36357eecbe70ea20e0233c jdk7u45-b34
+3dbb06a924cdf73d39b8543824ec88ae501ba5c6 jdk7u45-b35
3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u51-b00
d76613074ff357d0664b97b4aaf99fbb65dcec47 jdk7u51-b01
fb057871f094ebe4906ad6856326768b01a62c45 jdk7u51-b02
@@ -386,3 +395,53 @@
f0425ecbbb0ca9d8c87c250c19e8f9524b38833d jdk7u51-b11
f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u51-b12
d19a89fdfb9b959b8638441d9d396685d6c7ab7b jdk7u51-b13
+ef58b2b9a9a1e1a42b0139b57816a160c4681371 jdk7u51-b30
+5bca0d0969b13b1d9b8caba3cce8293a98d68318 jdk7u51-b31
+e9143dc3dc2a8f4b896e74f70d6c503d73c40533 jdk7u51-b33
+c1eaf405fb8d7beddd75c6f81671970f6baa70d8 jdk7u51-b34
+f5eee4f1d5b4a1e19febc9c26c863ae853ed6d2e jdk7u55-b00
+5010db5b9b5ab07a9409a5c557d3f43ab32dc428 jdk7u55-b01
+2ca3e1fa4455ad564228ad6e654498167af2f20d jdk7u55-b02
+c12b3c81366cb067ff4444952209d54bfa387353 jdk7u55-b03
+476d1bddaa32bf440953c3b1814ba38f16886c03 jdk7u55-b04
+7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u55-b05
+795654fce29c38d4c8504f760d8d8a36248d38ed jdk7u55-b06
+4b2ed892b195e95f7541aaa3b129a2caa5faae1d jdk7u55-b07
+db1323224053a18ecc62bdc1d3902d93b33f0b70 jdk7u55-b08
+534eeff29ac9fcbbb99ef8908548dbb368d04baf jdk7u55-b09
+d39dd4135844ca5c707bc39ae1d7e020d49880ce jdk7u55-b09
+b231536550067c3b00c77d0e035afe8faaa15581 jdk7u55-b10
+2d80b7cd7aae76f0909a210414317dcf846ad651 jdk7u55-b11
+07be5d5508733ed37c11fcd21a13ae3c8288313b jdk7u55-b12
+92fd166252c2701092a510002f4cf9285a20473d jdk7u55-b13
+4a5651c84b1e6cf26dc9b19f00747e5004efba68 jdk7u55-b30
+ffd99c5975217a14609851602c5f5dc005234aba jdk7u55-b14
+88f1bf248cc520e0bf7ef17bc862f87aab958373 jdk7u55-b31
+db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
+def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
+ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
+7d5b758810c20af12c6576b7d570477712360744 icedtea-2.5pre01
+3162252ff26b4e6788b0c79405b035b535afa018 icedtea-2.5pre02
+b1bcc999a8f1b4b4452b59c6636153bb0154cf5a jdk7u60-b03
+efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u60-b04
+9b6aff2241bf0d6fa9eab38a75a4eccdf9bb7335 icedtea-2.6pre01
+4fb749a3110727d5334c69793578a3254a053bf5 jdk7u60-b05
+46ca1ce7550f1463d60c3eacaf7b8cdc44b0c66e jdk7u60-b06
+d5a2f60006e3c4243abeee0f623e5c3f79372fd8 jdk7u60-b07
+0dd27693876d66d176457749d0f2161b219eba2d jdk7u60-b08
+7b571638b0f51bcbe04c088dfff569b4cba6bbdf jdk7u60-b09
+fb4981489b09594d2449527e2d511834cf8ad370 jdk7u60-b10
+c2bb87dae8a08eab6f4f336ce5a59865aa0214d6 jdk7u60-b11
+1a90de8005e3de2475fd9355dcdb6f5e60bf89cc jdk7u60-b12
+b06d4ed71ae0bc6e13f5a8437cb6388f17c66e84 jdk7u60-b13
+6f22501ca73cc21960cfe45a2684a0c902f46133 icedtea-2.6pre02
+068d2b78bd73fc2159a1c8a88dca3ca2841c4e16 icedtea-2.6pre03
+b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14
+b69f22ae0ef3ddc153d391ee30efd95e4417043c icedtea-2.6pre04
+605610f355ce3f9944fe33d9e5e66631843beb8d icedtea-2.6pre05
+04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15
+41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16
+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18
+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
+7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19
+efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u80-b00
diff -r 6aaf00000bd5 -r c8f2b525a839 .jcheck/conf
--- a/.jcheck/conf Wed Apr 16 01:58:46 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 6aaf00000bd5 -r c8f2b525a839 make/bridge/AccessBridgeJava/Makefile
--- a/make/bridge/AccessBridgeJava/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/bridge/AccessBridgeJava/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
#
# Java files to compile.
#
-FILES_java = com/sun/java/accessibility/AccessBridge.java
+FILES_java = com/sun/java/accessibility/AccessBridgeLoader.java com/sun/java/accessibility/AccessBridge.java
#
# Location for the newly built classfiles.
@@ -68,7 +68,7 @@
build: prebuild
prebuild:
- $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridge.java \
+ $(CP) $(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility/$(ABPLATFORM)/AccessBridgeLoader.java \
$(CLOSED_PLATFORM_SRC)/classes/com/sun/java/accessibility
all : build $(JARFILE)
diff -r 6aaf00000bd5 -r c8f2b525a839 make/bridge/Jabswitch/Makefile
--- a/make/bridge/Jabswitch/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/bridge/Jabswitch/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,10 @@
JAB_MANIFEST_INP = $(CLOSED_PLATFORM_SRC)/native/sun/bridge/jabswitch.manifest
JAB_MANIFEST_OUT = $(TEMPDIR)/jabswitch.exe.intermediate.manifest
-RC_FLAGS += /fo "$(VERSIONRES)"
+RC_FLAGS += /fo "$(VERSIONRES)" \
+ /D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
+ /D "JDK_INTERNAL_NAME=$(PROGRAM)" \
+ /D "JDK_FTYPE=0x1L"
OTHER_CPPFLAGS += /MD /Fo"$(TEMPDIR)/" /Fd"$(TEMPDIR)/" /analyze- /Od /Gd /nologo /Gm /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /RTC1 /W3 /ZI /Zc:wchar_t /EHsc
LDDFLAGS += Advapi32.lib Version.lib User32.lib
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/apple/osxui/Makefile
--- a/make/com/apple/osxui/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/apple/osxui/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -67,6 +67,7 @@
RESOURCE_BUNDLES_COMPILED_PROPERTIES += \
com/apple/laf/resources/aqua.properties
+LOCALE_SET_DEFINITION = jre
#
# Rules
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/oracle/Makefile
--- a/make/com/oracle/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/oracle/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -30,22 +30,8 @@
#SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
include $(BUILDDIR)/common/Defs.gmk
-JFR_SRCDIRS_EXIST := $(shell \
- if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
- echo true; \
- else \
- echo false; \
- fi)
-
-JFR =
-ifndef OPENJDK
- ifndef JAVASE_EMBEDDED
- ifeq ($(JFR_SRCDIRS_EXIST), true)
- ifneq (${ARCH},arm)
- JFR = jfr
- endif
- endif
- endif
+ifeq ($(BUILD_JFR), true)
+ JFR = jfr
endif
# build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/java/pack/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -75,7 +75,7 @@
OTHER_CXXFLAGS += $(ZINCLUDE)
LDDFLAGS += $(ZIPOBJS)
else
- LDDFLAGS += $(ZLIB_LIBS)
+ OTHER_LDLIBS += $(ZLIB_LIBS)
OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
endif
else
@@ -99,8 +99,7 @@
RES = $(OBJDIR)/$(PGRM).res
else
LDOUTPUT = -o #Have a space
- LDDFLAGS += -lc
- OTHER_LDLIBS += $(LIBCXX)
+ OTHER_LDLIBS += -lc $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
ifeq ("$(CC_VER_MAJOR)", "3")
@@ -157,7 +156,7 @@
$(prep-target)
$(RM) $(TEMPDIR)/mapfile-vers
$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
ifdef MT
$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/jmx/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -114,13 +114,19 @@
endif
ifeq ($(CROSS_COMPILE_ARCH),)
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(RMIC_JAVA)
else
-RMIC = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(BOOT_JAVA_CMD)
endif
+RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
$(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
$(prep-target)
+ if [ -x $(PAX_COMMAND) ] ; then \
+ if [ -w $(RMIC_VM) ] ; then \
+ $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \
+ fi ; \
+ fi
$(RMIC) -classpath "$(CLASSDESTDIR)" \
-d $(CLASSDESTDIR) \
-v1.2 \
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/nio/sctp/Exportedfiles.gmk
--- a/make/com/sun/nio/sctp/Exportedfiles.gmk Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/nio/sctp/Exportedfiles.gmk Mon Aug 11 16:38:08 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
# 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,6 +28,7 @@
#
ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), macosx)
FILES_export = \
sun/nio/ch/SctpAssocChange.java \
sun/nio/ch/SctpChannelImpl.java \
@@ -37,3 +38,4 @@
sun/nio/ch/SctpServerChannelImpl.java \
sun/nio/ch/SctpStdSocketOption.java
endif
+endif
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/nio/sctp/FILES_c.gmk
--- a/make/com/sun/nio/sctp/FILES_c.gmk Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/nio/sctp/FILES_c.gmk Mon Aug 11 16:38:08 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,10 @@
#
ifneq ($(PLATFORM),windows)
+ifneq ($(PLATFORM),macosx)
FILES_c = \
SctpNet.c \
SctpChannelImpl.c \
SctpServerChannelImpl.c
endif
+endif
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/nio/sctp/FILES_java.gmk
--- a/make/com/sun/nio/sctp/FILES_java.gmk Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/nio/sctp/FILES_java.gmk Mon Aug 11 16:38:08 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
# questions.
#
FILES_java = \
- com/sun/nio/sctp/AbstractNotificationHandler.java \
+ com/sun/nio/sctp/AbstractNotificationHandler.java \
com/sun/nio/sctp/Association.java \
com/sun/nio/sctp/AssociationChangeNotification.java \
com/sun/nio/sctp/HandlerResult.java \
@@ -43,9 +43,13 @@
com/sun/nio/sctp/ShutdownNotification.java \
\
sun/nio/ch/SctpMessageInfoImpl.java \
- sun/nio/ch/SctpStdSocketOption.java
+ sun/nio/ch/SctpStdSocketOption.java \
+ sun/nio/ch/SctpChannelImpl.java \
+ sun/nio/ch/SctpMultiChannelImpl.java \
+ sun/nio/ch/SctpServerChannelImpl.java
ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), macosx)
FILES_java += \
sun/nio/ch/SctpAssocChange.java \
sun/nio/ch/SctpAssociationImpl.java \
@@ -58,9 +62,5 @@
sun/nio/ch/SctpSendFailed.java \
sun/nio/ch/SctpServerChannelImpl.java \
sun/nio/ch/SctpShutdown.java
-else
-FILES_java += \
- sun/nio/ch/SctpChannelImpl.java \
- sun/nio/ch/SctpMultiChannelImpl.java \
- sun/nio/ch/SctpServerChannelImpl.java
endif
+endif
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/nio/sctp/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,15 @@
include FILES_java.gmk
include Exportedfiles.gmk
+ifeq ($(PLATFORM), windows)
+include $(BUILDDIR)/common/Classes.gmk
+endif
+ifeq ($(PLATFORM), macosx)
+include $(BUILDDIR)/common/Classes.gmk
+endif
+
ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), macosx)
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -60,19 +68,18 @@
-I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
ifeq ($(PLATFORM), linux)
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
COMPILER_WARNINGS_FATAL=true
+endif
#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
endif
ifeq ($(PLATFORM), solaris)
#LIBSCTP = -lsctp
OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
-endif # PLATFORM
-
-else # windows
-include $(BUILDDIR)/common/Classes.gmk
-endif # ifneq windows
-
+endif
+endif # macosx
+endif # windows
clean clobber::
$(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp
diff -r 6aaf00000bd5 -r c8f2b525a839 make/com/sun/security/auth/module/Makefile
--- a/make/com/sun/security/auth/module/Makefile Wed Apr 16 01:58:46 2014 +0000
+++ b/make/com/sun/security/auth/module/Makefile Mon Aug 11 16:38:08 2014 +0100
@@ -78,7 +78,3 @@
#
include $(BUILDDIR)/common/Library.gmk
-#
-# JVMDI implementation lives in the VM.
-#
-OTHER_LDLIBS = $(JVMLIB)
diff -r 6aaf00000bd5 -r c8f2b525a839 make/common/Defs-embedded.gmk
--- a/make/common/Defs-embedded.gmk Wed Apr 16 01:58:46 2014 +0000
+++ b/make/common/Defs-embedded.gmk Mon Aug 11 16:38:08 2014 +0100
@@ -64,14 +64,18 @@
ifeq ($(ZERO_BUILD), )
# NIO Platform specific source file location
ifdef CROSS_COMPILE_ARCH
- NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/
+ ifndef OPENJDK
+ NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/
+ endif
endif
# For ARM sflt we need to link to a library with improved FP accuracy
# and it must be linked after fdlibm - this places it at the end after libc
# -z muldefs avoids linker errors for duplicate symbols.
ifeq ($(CROSS_COMPILE_ARCH), arm)
- EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
+ ifneq ($(EXT_LIBS_PATH),)
+ EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
+ endif
endif
endif
diff -r 6aaf00000bd5 -r c8f2b525a839 make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk Wed Apr 16 01:58:46 2014 +0000
+++ b/make/common/Defs-linux.gmk Mon Aug 11 16:38:08 2014 +0100
@@ -188,15 +188,17 @@
# We need this frame pointer to make it easy to walk the stacks.
# This should be the default on X86, but ia64 and amd64 may not have this
# as the default.
+CFLAGS_REQUIRED_aarch64 += -fno-omit-frame-pointer -fsigned-char -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_hppa +=
CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
-LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
-CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN
+CFLAGS_REQUIRED_m68k +=
+CFLAGS_REQUIRED_mips +=
+CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_ppc += -m32 -fsigned-char -D_BIG_ENDIAN
ifeq ($(ARCH),ppc64)
ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
CFLAGS_REQUIRED_ppc64 += -m64 -D_BIG_ENDIAN
@@ -207,6 +209,13 @@
$(error Expected big/little for ARCH=ppc64, got OPENJDK_TARGET_CPU_ENDIAN=$(OPENJDK_TARGET_CPU_ENDIAN))
endif
endif
+CFLAGS_REQUIRED_s390 +=
+CFLAGS_REQUIRED_s390x += -m64
+CFLAGS_REQUIRED_sh += -mieee
+CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 -D_BIG_ENDIAN
+LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 -D_BIG_ENDIAN
+LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
ifeq ($(ZERO_BUILD), true)
CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
ifeq ($(ZERO_ENDIANNESS), little)
@@ -243,9 +252,7 @@
#
# Misc compiler options
#
More information about the distro-pkg-dev
mailing list