/hg/release/icedtea7-forest-2.5/jdk: 49 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 2 01:22:24 UTC 2014
changeset 9af71eceaee6 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9af71eceaee6
author: katleman
date: Thu Jan 16 11:52:13 2014 -0800
Added tag jdk7u60-b03 for changeset b1bcc999a8f1
changeset 48b6bddcd0bf in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=48b6bddcd0bf
author: uta
date: Mon May 27 15:18:00 2013 +0400
8014394: (fs) WatchService failing when watching \\server\$d
Reviewed-by: alanb
changeset a774c34382cc in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=a774c34382cc
author: alanb
date: Tue Oct 08 10:49:09 2013 +0100
8024788: (fs) Files.readAllBytes uses FileChannel which may not be supported by all providers
Reviewed-by: chegar
changeset 4e1095e23665 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=4e1095e23665
author: robm
date: Fri Dec 27 15:39:43 2013 +0000
7074436: (sc) SocketChannel can do short gathering writes when channel configured blocking (win)
Reviewed-by: chegar
changeset a1f5b443727c in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=a1f5b443727c
author: coffeys
date: Thu Nov 21 13:39:01 2013 +0000
8022698: javax/script/GetInterfaceTest.java fails since 7u45 b04 with -agentvm option
Reviewed-by: sundar
changeset 21528ae4d923 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=21528ae4d923
author: coffeys
date: Thu Jan 02 15:26:53 2014 +0000
Merge
changeset 1331fa69ef12 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1331fa69ef12
author: dbuck
date: Wed Jan 08 02:51:26 2014 -0800
6571600: JNI use results in UnsatisfiedLinkError looking for libmawt.so
Summary: Fix is to call dladdr with name less likely to cause name conflict.
Reviewed-by: serb, art
changeset aaa6b578707e in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=aaa6b578707e
author: dfuchs
date: Wed Jan 15 20:25:48 2014 +0100
8019853: Break logging and AWT circular dependency
Summary: Break logging and AWT circular dependency, which was at the root cause for 8023258 - Logger.getLogger() after ImageIO.read() returns different logger instance
Reviewed-by: mchung, art
changeset 17cf9917fdc8 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=17cf9917fdc8
author: dfuchs
date: Wed Jan 15 20:29:07 2014 +0100
8026404: Logging in Applet can trigger ACE: access denied ("java.lang.RuntimePermission" "modifyThreadGroup")
Summary: The test 'threadGroup.getParent() == null' can sometimes throw ACE and needs to be wrapped in doPrivileged.
Reviewed-by: alanb, mchung, dholmes
changeset 628c6d46263b in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=628c6d46263b
author: vlivanov
date: Fri Jan 17 01:54:38 2014 +0400
8009222: java.lang.IllegalArgumentException: not invocable, no method type when attempting to get getter method handle for a static field
Reviewed-by: jrose, twisti
changeset efc8886310cb in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=efc8886310cb
author: lana
date: Mon Jan 20 12:12:07 2014 -0800
Merge
changeset 19cc3b567644 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=19cc3b567644
author: katleman
date: Wed Jan 22 12:34:24 2014 -0800
Added tag jdk7u60-b04 for changeset efc8886310cb
changeset 2fd7486b4b35 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=2fd7486b4b35
author: mbankal
date: Tue Jan 21 07:53:24 2014 -0800
8012244: java/net/Socket/asyncClose/Race.java fails intermittently on Windows
Reviewed-by: chegar
changeset 08ff8b738146 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=08ff8b738146
author: dfuchs
date: Wed Jan 22 14:11:55 2014 +0100
8029281: Synchronization issues in Logger and LogManager
Summary: Fixes several race conditions in logging which have been at the root cause of intermittent test failures.
Reviewed-by: mchung, plevart
changeset e65808224f83 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=e65808224f83
author: dfuchs
date: Tue Jan 21 14:28:13 2014 +0100
8031980: Add new j.u.l deadlock test for JDK-8027670 and JDK-8029281
Summary: adds a new test for the deadlock found in JDK-8027670 and fixed in JDK-8029281.
Reviewed-by: mchung
changeset 64e02cab7647 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=64e02cab7647
author: alanb
date: Sun Nov 11 10:05:37 2012 +0000
8003253: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java hang intermittently [win]
Reviewed-by: chegar
changeset 767f4cb863ff in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=767f4cb863ff
author: alanb
date: Wed Nov 14 12:56:26 2012 +0000
8003285: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java fails again [macosx]
Reviewed-by: chegar
changeset 6be61bafe517 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=6be61bafe517
author: alanb
date: Thu Jan 09 11:45:01 2014 +0000
8003895: java/nio/channels/AsynchronousChannelGroup/Unbounded.java failing again [win64]
Reviewed-by: chegar
changeset 3f0f5d25e738 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3f0f5d25e738
author: coffeys
date: Fri Jan 10 15:10:25 2014 +0000
8017779: java/net/Authenticator/B4769350.java fails
Reviewed-by: chegar
Contributed-by: Tristan Yan <tristan.yan at oracle.com>, Kurchi Subhra Hazra <kurchisubhra at gmail.com>
changeset d9e184a0efd0 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d9e184a0efd0
author: uta
date: Wed Jan 22 18:13:07 2014 -0800
8020191: System.getProperty("os.name") returns "Windows NT (unknown)" on Windows 8.1
Reviewed-by: alanb, khazra, chegar
changeset d7d361cb8316 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d7d361cb8316
author: tyan
date: Fri Jan 24 12:25:08 2014 +0800
8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning
Reviewed-by: alanb, martin
changeset 4fb749a31107 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=4fb749a31107
author: weijun
date: Tue Jan 21 12:08:02 2014 +0800
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
Reviewed-by: mullan
changeset 46ca1ce7550f in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=46ca1ce7550f
author: katleman
date: Wed Feb 05 12:31:26 2014 -0800
Added tag jdk7u60-b05 for changeset 4fb749a31107
changeset 20e2e15dc5b1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=20e2e15dc5b1
author: katleman
date: Wed Feb 12 14:56:43 2014 -0800
Added tag jdk7u60-b06 for changeset 46ca1ce7550f
changeset 51962feb89c8 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=51962feb89c8
author: igerasim
date: Thu Jan 23 03:22:58 2014 +0400
8023881: IDN.USE_STD3_ASCII_RULES option is too strict to use Unicode in IDN.toASCII
Reviewed-by: michaelm
changeset 0b0b3012a6af in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=0b0b3012a6af
author: igerasim
date: Sat Jan 25 00:49:37 2014 +0400
8030698: Several GUI labels in jconsole need correction
Reviewed-by: sla
changeset ddacc52ea09e in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=ddacc52ea09e
author: igerasim
date: Fri Jan 24 21:46:58 2014 +0400
8030878: JConsole issues meaningless message if SSL connection fails
Reviewed-by: mchung, sla
changeset 3bb9483ca099 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3bb9483ca099
author: bchristi
date: Fri Aug 02 15:30:11 2013 -0700
8011194: Apps launched via double-clicked .jars have file.encoding value of US-ASCII on Mac OS X
Summary: On Mac, default to UTF-8 if no environmental hints are available
Reviewed-by: naoto, ddehaven
changeset 4e58dadf5ee8 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=4e58dadf5ee8
author: bchristi
date: Tue Jan 28 11:19:09 2014 -0800
7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx]
Summary: On MacOS X set user.home to value of NSHomeDirectory()
Reviewed-by: alanb, ddehaven, mduigou
changeset 63c5c6443857 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=63c5c6443857
author: miroslawzn
date: Thu Jan 30 13:28:59 2014 -0800
8011944: Sort fails with ArrayIndexOutOfBoundsException
Reviewed-by: alanb
changeset 1ef6be92ce88 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1ef6be92ce88
author: aefimov
date: Tue Feb 04 17:37:42 2014 +0400
8030822: (tz) Support tzdata2013i
Reviewed-by: coffeys, mfang, okutsu
changeset 664f8c3aa468 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=664f8c3aa468
author: aefimov
date: Fri Jan 31 18:10:29 2014 +0400
8027973: javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java hangs (win)
Reviewed-by: alanb, dfuchs, joehw
changeset c7c740fb7ff0 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=c7c740fb7ff0
author: lana
date: Tue Feb 11 14:50:22 2014 -0800
Merge
changeset 198df3575e01 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=198df3575e01
author: twisti
date: Wed Jul 03 11:35:06 2013 -0700
8019184: MethodHandles.catchException() fails when methods have 8 args + varargs
Reviewed-by: jrose
changeset d5a2f60006e3 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d5a2f60006e3
author: lana
date: Sat Feb 15 17:57:42 2014 -0800
Merge
changeset 0dd27693876d in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=0dd27693876d
author: katleman
date: Wed Feb 19 14:04:27 2014 -0800
Added tag jdk7u60-b07 for changeset d5a2f60006e3
changeset 3cd7a0321a83 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3cd7a0321a83
author: katleman
date: Wed Feb 26 12:46:55 2014 -0800
Added tag jdk7u60-b08 for changeset 0dd27693876d
changeset 6c72cdaf5f99 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=6c72cdaf5f99
author: kshefov
date: Tue Feb 18 16:00:33 2014 +0400
8017456: [TEST_BUG] java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html: test frames remain after test execution
Reviewed-by: serb, alexsch
changeset 7b571638b0f5 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=7b571638b0f5
author: lana
date: Thu Feb 27 01:04:12 2014 -0800
Merge
changeset c4763416f516 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=c4763416f516
author: katleman
date: Wed Mar 05 12:27:34 2014 -0800
Added tag jdk7u60-b09 for changeset 7b571638b0f5
changeset 39e8a6db842d in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=39e8a6db842d
author: mfang
date: Wed Mar 05 09:15:41 2014 -0800
8035988: 7u60 l10n resource file translation update 1
Reviewed-by: naoto, yhuang
changeset fb4981489b09 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=fb4981489b09
author: lana
date: Wed Mar 05 16:25:50 2014 -0800
Merge
changeset c2bb87dae8a0 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=c2bb87dae8a0
author: katleman
date: Wed Mar 12 14:35:53 2014 -0700
Added tag jdk7u60-b10 for changeset fb4981489b09
changeset b35c3fd4d5cf in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=b35c3fd4d5cf
author: katleman
date: Wed Mar 19 10:04:23 2014 -0700
Added tag jdk7u60-b11 for changeset c2bb87dae8a0
changeset f648607aa4a3 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f648607aa4a3
author: chegar
date: Tue Mar 11 18:37:40 2014 +0000
8035897: Better memory allocation for file descriptors greater than 1024 on macosx
Reviewed-by: michaelm, alanb
changeset 2dcbb570e227 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=2dcbb570e227
author: chegar
date: Tue Mar 04 13:27:55 2014 +0000
8036584: Review comments from 8035897
Reviewed-by: alanb
changeset 244159d35014 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=244159d35014
author: pchelko
date: Mon Mar 03 16:10:16 2014 +0400
8032960: Running forms URL throws NullPointerException in Javaconsole.
Reviewed-by: anthony, serb
changeset 1a90de8005e3 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=1a90de8005e3
author: lana
date: Wed Mar 19 10:41:46 2014 -0700
Merge
changeset 06f771c9a7b7 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=06f771c9a7b7
author: andrew
date: Wed Apr 02 02:16:12 2014 +0100
Merge jdk7u60-b12
diffstat:
.hgtags | 24 +
.jcheck/conf | 2 -
make/com/sun/java/pack/Makefile | 7 +-
make/com/sun/jmx/Makefile | 10 +-
make/com/sun/nio/Makefile | 2 +-
make/com/sun/nio/sctp/Makefile | 2 +
make/com/sun/security/auth/module/Makefile | 6 +-
make/com/sun/tools/attach/Exportedfiles.gmk | 5 +
make/com/sun/tools/attach/FILES_c.gmk | 5 +
make/com/sun/tools/attach/FILES_java.gmk | 9 +-
make/common/Defs-aix.gmk | 391 +
make/common/Defs-linux.gmk | 32 +-
make/common/Defs-macosx.gmk | 10 +-
make/common/Defs.gmk | 32 +-
make/common/Library.gmk | 42 +-
make/common/Program.gmk | 96 +-
make/common/Release.gmk | 32 +-
make/common/shared/Compiler-gcc.gmk | 76 +-
make/common/shared/Compiler-xlc_r.gmk | 37 +
make/common/shared/Defs-aix.gmk | 167 +
make/common/shared/Defs-java.gmk | 23 +-
make/common/shared/Defs-utils.gmk | 4 +
make/common/shared/Defs-versions.gmk | 7 +-
make/common/shared/Defs.gmk | 2 +-
make/common/shared/Platform.gmk | 23 +-
make/common/shared/Sanity.gmk | 8 +
make/docs/Makefile | 6 +-
make/java/fdlibm/Makefile | 7 +
make/java/java/Makefile | 2 +
make/java/jli/Makefile | 31 +-
make/java/main/java/mapfile-aarch64 | 39 +
make/java/main/java/mapfile-ppc64 | 43 +
make/java/management/Makefile | 6 +
make/java/net/FILES_c.gmk | 11 +
make/java/net/Makefile | 26 +-
make/java/nio/Makefile | 259 +-
make/java/npt/Makefile | 2 +-
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/jpda/transport/socket/Makefile | 2 +-
make/sun/awt/FILES_c_unix.gmk | 10 +
make/sun/awt/Makefile | 29 +-
make/sun/awt/mawt.gmk | 42 +-
make/sun/cmm/lcms/FILES_c_unix.gmk | 7 +-
make/sun/cmm/lcms/Makefile | 8 +-
make/sun/font/Makefile | 15 +-
make/sun/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/africa | 5 +-
make/sun/javazic/tzdata/asia | 30 +-
make/sun/javazic/tzdata/northamerica | 8 +-
make/sun/jawt/Makefile | 11 +
make/sun/jpeg/FILES_c.gmk | 6 +-
make/sun/jpeg/Makefile | 11 +-
make/sun/lwawt/FILES_c_macosx.gmk | 6 +
make/sun/lwawt/Makefile | 7 +-
make/sun/native2ascii/Makefile | 2 +-
make/sun/net/FILES_java.gmk | 229 +-
make/sun/nio/cs/Makefile | 4 +-
make/sun/security/Makefile | 11 +-
make/sun/security/ec/Makefile | 27 +-
make/sun/security/jgss/wrapper/Makefile | 2 +-
make/sun/security/krb5/Makefile | 8 +-
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 | 37 +-
make/sun/xawt/FILES_c_unix.gmk | 20 +
make/sun/xawt/Makefile | 71 +-
make/tools/Makefile | 9 +
make/tools/freetypecheck/Makefile | 21 +-
make/tools/generate_nimbus/Makefile | 1 +
make/tools/sharing/classlist.aix | 2406 ++++++
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/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/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/jndi/dns/DnsContextFactory.java | 2 +-
src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +-
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/script/javascript/RhinoScriptEngine.java | 2 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +-
src/share/classes/com/sun/script/javascript/RhinoTopLevel.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/Toolkit.java | 30 +-
src/share/classes/java/awt/color/ICC_Profile.java | 4 +-
src/share/classes/java/io/InputStream.java | 2 +-
src/share/classes/java/lang/invoke/DirectMethodHandle.java | 3 +-
src/share/classes/java/lang/invoke/MethodHandleImpl.java | 3 +-
src/share/classes/java/net/IDN.java | 40 +-
src/share/classes/java/net/SocksSocketImpl.java | 4 +-
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/TimSort.java | 2 +-
src/share/classes/java/util/jar/JarFile.java | 13 +-
src/share/classes/java/util/logging/LogManager.java | 108 +-
src/share/classes/java/util/logging/Logger.java | 4 +-
src/share/classes/javax/crypto/Cipher.java | 172 +-
src/share/classes/javax/swing/JComponent.java | 13 +-
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 | 10 +-
src/share/classes/javax/swing/MenuSelectionManager.java | 5 +-
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/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/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/AppContext.java | 73 +-
src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +-
src/share/classes/sun/awt/resources/awt_pt_BR.properties | 8 +-
src/share/classes/sun/java2d/cmm/lcms/LCMS.java | 2 +-
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/JavaAWTAccess.java | 14 +-
src/share/classes/sun/misc/SharedSecrets.java | 10 +-
src/share/classes/sun/misc/Version.java.template | 58 +-
src/share/classes/sun/nio/ch/FileChannelImpl.java | 3 +-
src/share/classes/sun/nio/ch/FileDispatcher.java | 12 +-
src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java | 3 +-
src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java | 2 +-
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/krb5/internal/ccache/FileCredentialsCache.java | 96 +-
src/share/classes/sun/security/pkcs11/Config.java | 3 +
src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +-
src/share/classes/sun/security/pkcs11/P11Util.java | 2 +-
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 23 +-
src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +-
src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +-
src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 +
src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java | 4 +-
src/share/classes/sun/security/util/ObjectIdentifier.java | 2 +-
src/share/classes/sun/swing/DefaultLookup.java | 3 +-
src/share/classes/sun/swing/SwingUtilities2.java | 17 +-
src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider | 1 +
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 | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_de.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_es.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_fr.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_it.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_ja.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_ko.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_sv.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java | 4 +-
src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java | 4 +-
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/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 | 1 -
src/share/native/com/sun/media/sound/SoundDefs.h | 9 +
src/share/native/common/check_code.c | 35 +
src/share/native/java/net/net_util.c | 9 +
src/share/native/java/util/zip/Deflater.c | 46 +-
src/share/native/java/util/zip/Inflater.c | 6 +-
src/share/native/sun/awt/image/awt_ImageRep.c | 2 +-
src/share/native/sun/awt/image/jpeg/README | 385 -
src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 12 +-
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 | 1384 +++
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 | 2 +-
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/medialib/mlib_sys.c | 2 +-
src/share/native/sun/awt/medialib/mlib_types.h | 7 +-
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 | 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/java2d/opengl/OGLFuncs.h | 2 +-
src/share/native/sun/security/ec/ECC_JNI.cpp | 12 +-
src/share/native/sun/security/ec/ecc_impl.h | 293 +
src/share/native/sun/security/ec/impl/ecc_impl.h | 263 -
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/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/npt/npt.h | 8 +-
src/solaris/back/exec_md.c | 4 +-
src/solaris/bin/aarch64/jvm.cfg | 36 +
src/solaris/bin/java_md_solinux.c | 27 +-
src/solaris/bin/ppc64/jvm.cfg | 33 +
src/solaris/classes/java/lang/UNIXProcess.java.aix | 303 +
src/solaris/classes/sun/awt/X11/XConstants.java | 5 +
src/solaris/classes/sun/awt/X11/XWM.java | 26 +-
src/solaris/classes/sun/awt/X11/XWindowPeer.java | 2 +
src/solaris/classes/sun/awt/fontconfigs/aix.fontconfig.properties | 75 +
src/solaris/classes/sun/nio/ch/AixAsynchronousChannelProvider.java | 91 +
src/solaris/classes/sun/nio/ch/AixPollPort.java | 536 +
src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java | 2 +
src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java | 8 +-
src/solaris/classes/sun/nio/ch/Port.java | 8 +
src/solaris/classes/sun/nio/fs/AixFileStore.java | 106 +
src/solaris/classes/sun/nio/fs/AixFileSystem.java | 94 +
src/solaris/classes/sun/nio/fs/AixFileSystemProvider.java | 58 +
src/solaris/classes/sun/nio/fs/AixNativeDispatcher.java | 56 +
src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java | 2 +
src/solaris/classes/sun/nio/fs/UnixCopyFile.java | 8 +-
src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java | 6 +-
src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java | 4 +-
src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java | 4 +-
src/solaris/classes/sun/print/UnixPrintService.java | 73 +-
src/solaris/classes/sun/print/UnixPrintServiceLookup.java | 97 +-
src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java | 4 +-
src/solaris/classes/sun/tools/attach/AixAttachProvider.java | 88 +
src/solaris/classes/sun/tools/attach/AixVirtualMachine.java | 317 +
src/solaris/demo/jvmti/hprof/hprof_md.c | 87 +-
src/solaris/javavm/export/jni_md.h | 18 +-
src/solaris/native/com/sun/management/UnixOperatingSystem_md.c | 20 +-
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 | 207 +
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 | 398 +
src/solaris/native/common/deps/gtk2/gtk_fp.h | 469 +
src/solaris/native/common/deps/syscalls_fp.c | 122 +
src/solaris/native/common/deps/syscalls_fp.h | 79 +
src/solaris/native/java/io/UnixFileSystem_md.c | 2 +-
src/solaris/native/java/lang/UNIXProcess_md.c | 2 +-
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/net/Inet4AddressImpl.c | 55 +
src/solaris/native/java/net/NetworkInterface.c | 173 +-
src/solaris/native/java/net/PlainDatagramSocketImpl.c | 24 +-
src/solaris/native/java/net/PlainSocketImpl.c | 5 +-
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 | 60 +-
src/solaris/native/java/net/net_util_md.c | 27 +
src/solaris/native/java/net/net_util_md.h | 13 +-
src/solaris/native/java/util/TimeZone_md.c | 76 +-
src/solaris/native/sun/awt/CUPSfuncs.c | 137 +-
src/solaris/native/sun/awt/awt_GraphicsEnv.c | 2 +-
src/solaris/native/sun/awt/awt_LoadLibrary.c | 69 +-
src/solaris/native/sun/awt/awt_UNIXToolkit.c | 20 +-
src/solaris/native/sun/awt/fontconfig.h | 941 --
src/solaris/native/sun/awt/fontpath.c | 420 +-
src/solaris/native/sun/awt/gtk2_interface.c | 988 +-
src/solaris/native/sun/awt/gtk2_interface.h | 580 +-
src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 7 +
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/OGLFuncs_md.h | 2 +-
src/solaris/native/sun/java2d/x11/XRBackendNative.c | 6 +-
src/solaris/native/sun/net/spi/DefaultProxySelector.c | 465 +-
src/solaris/native/sun/nio/ch/AixPollPort.c | 181 +
src/solaris/native/sun/nio/ch/DatagramChannelImpl.c | 2 +-
src/solaris/native/sun/nio/ch/EPollArrayWrapper.c | 1 -
src/solaris/native/sun/nio/ch/FileDispatcherImpl.c | 54 +-
src/solaris/native/sun/nio/ch/Net.c | 126 +-
src/solaris/native/sun/nio/ch/PollArrayWrapper.c | 51 +-
src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c | 9 +
src/solaris/native/sun/nio/fs/AixNativeDispatcher.c | 224 +
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 | 179 +-
src/solaris/native/sun/security/krb5/internal/ccache/krb5ccache.c | 113 +
src/solaris/native/sun/security/pkcs11/j2secmod_md.c | 15 +-
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/pcsc_md.c | 40 +-
src/solaris/native/sun/security/smartcardio/pcsc_md.h | 40 +
src/solaris/native/sun/tools/attach/AixVirtualMachine.c | 283 +
src/solaris/native/sun/tools/attach/BsdVirtualMachine.c | 4 +
src/solaris/native/sun/xawt/awt_Desktop.c | 103 +-
src/windows/classes/java/net/DualStackPlainSocketImpl.java | 5 +-
src/windows/classes/sun/awt/windows/WToolkit.java | 6 +-
src/windows/classes/sun/nio/ch/FileDispatcherImpl.java | 3 +-
src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java | 3 +-
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/native/java/lang/java_props_md.c | 4 +-
src/windows/native/java/net/SocketInputStream.c | 52 +-
src/windows/native/sun/nio/ch/SocketDispatcher.c | 67 +-
src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c | 28 +-
src/windows/native/sun/security/pkcs11/j2secmod_md.c | 4 +-
src/windows/native/sun/security/pkcs11/wrapper/p11_md.h | 4 +
src/windows/resource/java.manifest | 10 +-
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/cachedSocket/7056731.sh | 2 +-
test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java | 13 +-
test/com/sun/jdi/ImmutableResourceTest.sh | 2 +-
test/com/sun/jdi/JITDebug.sh | 2 +-
test/com/sun/jdi/ShellScaffold.sh | 4 +-
test/com/sun/jdi/Solaris32AndSolaris64Test.sh | 2 +-
test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh | 2 +-
test/com/sun/tools/attach/CommonSetup.sh | 2 +-
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/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh | 8 +
test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java | 198 +
test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh | 8 +
test/java/io/Serializable/evolution/RenamePackage/run.sh | 2 +-
test/java/io/Serializable/serialver/classpath/run.sh | 2 +-
test/java/io/Serializable/serialver/nested/run.sh | 2 +-
test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh | 3 +
test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh | 3 +
test/java/lang/ProcessBuilder/Basic.java | 11 +-
test/java/lang/StringCoding/CheckEncodings.sh | 2 +-
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/loaderLeak/LoaderLeak.sh | 2 +-
test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh | 4 +
test/java/lang/invoke/8009222/Test8009222.java | 49 +
test/java/lang/invoke/TestCatchExceptionWithVarargs.java | 97 +
test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh | 2 +-
test/java/net/Authenticator/B4769350.java | 489 +-
test/java/net/Authenticator/B4933582.sh | 2 +-
test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh | 2 +-
test/java/net/IDN/UseSTD3ASCIIRules.java | 80 +
test/java/net/ServerSocket/AnotherSelectFdsLimit.java | 78 +
test/java/net/Socket/OldSocketImpl.sh | 2 +-
test/java/net/Socket/asyncClose/Race.java | 8 +-
test/java/net/URL/B5086147.sh | 2 +-
test/java/net/URL/TestHttps.java | 34 +
test/java/net/URL/runconstructor.sh | 2 +-
test/java/net/URLClassLoader/B5077773.sh | 2 +-
test/java/net/URLClassLoader/sealing/checksealed.sh | 2 +-
test/java/net/URLConnection/6212146/test.sh | 2 +-
test/java/nio/MappedByteBuffer/Basic.java | 91 +-
test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java | 69 +-
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/charset/coders/CheckSJISMappingProp.sh | 2 +-
test/java/nio/charset/spi/basic.sh | 4 +-
test/java/nio/file/Files/BytesAndLines.java | 14 +-
test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh | 2 +-
test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java | 9 +-
test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java | 9 +-
test/java/rmi/registry/readTest/readTest.sh | 2 +-
test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh | 4 +
test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh | 4 +
test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh | 4 +
test/java/security/Security/signedfirst/Dyn.sh | 4 +
test/java/security/Security/signedfirst/Static.sh | 4 +
test/java/util/Arrays/TimSortStackSize.java | 123 +
test/java/util/Currency/PropertiesTest.sh | 2 +-
test/java/util/Locale/LocaleCategory.sh | 2 +-
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/PluggableLocale/ExecTest.sh | 2 +-
test/java/util/ResourceBundle/Bug6299235Test.sh | 2 +-
test/java/util/ResourceBundle/Control/ExpirationTest.sh | 2 +-
test/java/util/ServiceLoader/basic.sh | 2 +-
test/java/util/logging/TestAppletLoggerContext.java | 19 +-
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/prefs/CheckUserPrefsStorage.sh | 2 +-
test/javax/crypto/SecretKeyFactory/FailOverTest.sh | 2 +-
test/javax/imageio/stream/StreamCloserLeak/run_test.sh | 8 +
test/javax/script/CommonSetup.sh | 2 +-
test/javax/security/auth/Subject/doAs/Test.sh | 5 +
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/transform/jdk8004476/SecureProcessingTest.xml | 2 -
test/javax/xml/jaxp/transform/jdk8004476/TestBase.java | 82 -
test/javax/xml/jaxp/transform/jdk8004476/XPathExFuncTest.java | 287 -
test/javax/xml/jaxp/transform/jdk8004476/XSLTExFuncTest.java | 248 -
test/javax/xml/jaxp/transform/jdk8004476/tokenize.xml | 7 -
test/javax/xml/jaxp/transform/jdk8004476/tokenize.xsl | 30 -
test/lib/security/java.policy/Ext_AllPolicy.sh | 2 +-
test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh | 2 +-
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/misc/URLClassPath/ClassnameCharTest.sh | 2 +-
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/MarkResetTest.sh | 2 +-
test/sun/net/www/http/HttpClient/RetryPost.sh | 2 +-
test/sun/net/www/protocol/file/DirPermissionDenied.sh | 1 +
test/sun/net/www/protocol/jar/B5105410.sh | 2 +-
test/sun/net/www/protocol/jar/jarbug/run.sh | 2 +-
test/sun/security/krb5/runNameEquals.sh | 4 +
test/sun/security/pkcs11/MessageDigest/TestCloning.java | 141 +
test/sun/security/pkcs11/Provider/ConfigQuotedString.sh | 6 +
test/sun/security/pkcs11/Provider/Login.sh | 6 +
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/provider/PolicyFile/getinstance/getinstance.sh | 4 +
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh | 2 +-
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh | 2 +-
test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh | 2 +-
test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh | 2 +-
test/sun/security/tools/jarsigner/AlgOptions.sh | 2 +-
test/sun/security/tools/jarsigner/EntriesOrder.java | 204 +
test/sun/security/tools/jarsigner/PercentSign.sh | 2 +-
test/sun/security/tools/jarsigner/diffend.sh | 2 +-
test/sun/security/tools/jarsigner/oldsig.sh | 2 +-
test/sun/security/tools/keytool/AltProviderPath.sh | 2 +-
test/sun/security/tools/keytool/CloneKeyAskPassword.sh | 4 +
test/sun/security/tools/keytool/NoExtNPE.sh | 4 +
test/sun/security/tools/keytool/SecretKeyKS.sh | 2 +-
test/sun/security/tools/keytool/StandardAlgName.sh | 2 +-
test/sun/security/tools/keytool/printssl.sh | 2 +-
test/sun/security/tools/keytool/resource.sh | 2 +-
test/sun/security/tools/keytool/standard.sh | 2 +-
test/sun/security/tools/policytool/Alias.sh | 2 +-
test/sun/security/tools/policytool/ChangeUI.sh | 2 +-
test/sun/security/tools/policytool/OpenPolicy.sh | 2 +-
test/sun/security/tools/policytool/SaveAs.sh | 2 +-
test/sun/security/tools/policytool/UpdatePermissions.sh | 2 +-
test/sun/security/tools/policytool/UsePolicy.sh | 2 +-
test/sun/security/tools/policytool/i18n.sh | 2 +-
test/sun/tools/native2ascii/NativeErrors.java | 4 +-
test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh | 2 +-
test/tools/launcher/RunpathTest.java | 84 +
test/tools/pack200/MemoryAllocatorTest.java | 369 +
714 files changed, 43655 insertions(+), 45548 deletions(-)
diffs (truncated from 103549 to 500 lines):
diff -r b1bcc999a8f1 -r 06f771c9a7b7 .hgtags
--- a/.hgtags Thu Jan 02 09:48:25 2014 -0800
+++ b/.hgtags Wed Apr 02 02:16:12 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
@@ -186,11 +192,15 @@
a2bd61800667c38d759a0e02a756063d47dbcdc0 jdk7u6-b10
18a1b4f0681ae6e748fc60162dd76e357de3304b jdk7u6-b11
76306dce87104d9f333db3371ca97c80cac9674a jdk7u6-b12
+35172a51cc7639a44fe06ffbd5be471e48b71a88 ppc-aix-port-b01
+3097457689ba2d41b1d692191c5ba2f2b30aff9e ppc-aix-port-b02
+3097457689ba2d41b1d692191c5ba2f2b30aff9e ppc-aix-port-b03
aa49fe7490963f0c53741fbca3a175e0fec93951 jdk7u6-b13
3ce621d9b988abcccd86b52a97ea39133006c245 jdk7u6-b14
e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint
4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
@@ -258,11 +268,13 @@
cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07
b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08
2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09
+b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint
e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10
9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11
ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12
7c0d4bfd9d2c183ebf8566013af5111927b472f6 jdk7u14-b13
3982fc37bc256b07a710f25215e5525cfbefe2ed jdk7u14-b14
+739869c45976bb154908af5d145b7ed98c6a7d47 ppc-aix-port-b04
2eb3ac105b7fe7609a20c9986ecbccab71f1609f jdk7u14-b15
835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01
0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02
@@ -365,6 +377,7 @@
c5ca4daec23b5e7f99ac8d684f5016ff8bfebbb0 jdk7u45-b18
4797f984f6c93c433aa797e9b2d8f904cf083f96 jdk7u45-b30
8c343a783777b8728cb819938f387db0acf7f3ac jdk7u45-b31
+db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
402d54c7d8ce95f3945cc3d698e528e4adec7b9b jdk7u45-b33
34e8f9f26ae612ebac36357eecbe70ea20e0233c jdk7u45-b34
3c9a6d9eafd31be44b0ade0354e60f5078b417a4 jdk7u51-b00
@@ -386,3 +399,14 @@
db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
+7d5b758810c20af12c6576b7d570477712360744 icedtea-2.5pre01
+3162252ff26b4e6788b0c79405b035b535afa018 icedtea-2.5pre02
+b1bcc999a8f1b4b4452b59c6636153bb0154cf5a jdk7u60-b03
+efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u60-b04
+4fb749a3110727d5334c69793578a3254a053bf5 jdk7u60-b05
+46ca1ce7550f1463d60c3eacaf7b8cdc44b0c66e jdk7u60-b06
+d5a2f60006e3c4243abeee0f623e5c3f79372fd8 jdk7u60-b07
+0dd27693876d66d176457749d0f2161b219eba2d jdk7u60-b08
+7b571638b0f51bcbe04c088dfff569b4cba6bbdf jdk7u60-b09
+fb4981489b09594d2449527e2d511834cf8ad370 jdk7u60-b10
+c2bb87dae8a08eab6f4f336ce5a59865aa0214d6 jdk7u60-b11
diff -r b1bcc999a8f1 -r 06f771c9a7b7 .jcheck/conf
--- a/.jcheck/conf Thu Jan 02 09:48:25 2014 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/java/pack/Makefile Wed Apr 02 02:16:12 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 b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/jmx/Makefile Wed Apr 02 02:16:12 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 b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/nio/Makefile
--- a/make/com/sun/nio/Makefile Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/nio/Makefile Wed Apr 02 02:16:12 2014 +0100
@@ -31,7 +31,7 @@
include $(BUILDDIR)/common/Defs.gmk
# MMM: disable for now
-ifneq ($(PLATFORM), macosx)
+ifeq (, $(findstring $(PLATFORM), macosx aix))
include $(BUILDDIR)/common/Subdirs.gmk
SUBDIRS = sctp
endif
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/nio/sctp/Makefile Wed Apr 02 02:16:12 2014 +0100
@@ -60,7 +60,9 @@
-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
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/security/auth/module/Makefile
--- a/make/com/sun/security/auth/module/Makefile Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/security/auth/module/Makefile Wed Apr 02 02:16:12 2014 +0100
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
-ifneq (,$(findstring $(PLATFORM), linux macosx))
+ifneq (,$(findstring $(PLATFORM), linux macosx aix))
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
@@ -78,7 +78,3 @@
#
include $(BUILDDIR)/common/Library.gmk
-#
-# JVMDI implementation lives in the VM.
-#
-OTHER_LDLIBS = $(JVMLIB)
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/tools/attach/Exportedfiles.gmk
--- a/make/com/sun/tools/attach/Exportedfiles.gmk Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/tools/attach/Exportedfiles.gmk Wed Apr 02 02:16:12 2014 +0100
@@ -47,3 +47,8 @@
FILES_export = \
sun/tools/attach/BsdVirtualMachine.java
endif
+
+ifeq ($(PLATFORM), aix)
+FILES_export = \
+ sun/tools/attach/AixVirtualMachine.java
+endif
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/tools/attach/FILES_c.gmk
--- a/make/com/sun/tools/attach/FILES_c.gmk Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/tools/attach/FILES_c.gmk Wed Apr 02 02:16:12 2014 +0100
@@ -43,3 +43,8 @@
FILES_c = \
BsdVirtualMachine.c
endif
+
+ifeq ($(PLATFORM), aix)
+FILES_c = \
+ AixVirtualMachine.c
+endif
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/com/sun/tools/attach/FILES_java.gmk
--- a/make/com/sun/tools/attach/FILES_java.gmk Thu Jan 02 09:48:25 2014 -0800
+++ b/make/com/sun/tools/attach/FILES_java.gmk Wed Apr 02 02:16:12 2014 +0100
@@ -32,7 +32,7 @@
com/sun/tools/attach/spi/AttachProvider.java \
sun/tools/attach/HotSpotAttachProvider.java \
sun/tools/attach/HotSpotVirtualMachine.java
-
+
ifeq ($(PLATFORM), solaris)
FILES_java += \
sun/tools/attach/SolarisAttachProvider.java
@@ -48,11 +48,16 @@
sun/tools/attach/BsdAttachProvider.java
endif
+ifeq ($(PLATFORM), aix)
+FILES_java += \
+ sun/tools/attach/AixAttachProvider.java
+endif
+
#
# Files that need to be copied
#
SERVICEDIR = $(CLASSBINDIR)/META-INF/services
-
+
FILES_copy = \
$(SERVICEDIR)/com.sun.tools.attach.spi.AttachProvider
diff -r b1bcc999a8f1 -r 06f771c9a7b7 make/common/Defs-aix.gmk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/Defs-aix.gmk Wed Apr 02 02:16:12 2014 +0100
@@ -0,0 +1,391 @@
+#
+# Copyright (c) 1995, 2012, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# Makefile to specify compiler flags for programs and libraries
+# targeted to AIX. Should not contain any rules.
+#
+# WARNING: This file is shared with other workspaces.
+# So when it includes other files, it must use JDK_TOPDIR.
+#
+
+# Warning: the following variables are overridden by Defs.gmk. Set
+# values will be silently ignored:
+# CFLAGS (set $(OTHER_CFLAGS) instead)
+# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
+# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
+# LDFLAGS (set $(OTHER_LDFAGS) instead)
+# LDLIBS (set $(EXTRA_LIBS) instead)
+# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
+# LINTFLAGS (set $(OTHER_LINTFLAGS) instead)
+#
+# Note: CPPFLAGS are used in C and C++ compiles.
+#
+
+# Get shared JDK settings
+include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
+
+# define these to avoid picking up ones from aliases or from
+# non-standard locations
+#
+
+AR = $(USRBIN_PATH)ar
+BASENAME = $(UNIXCOMMAND_PATH)basename
+CAT = $(UNIXCOMMAND_PATH)cat
+CD = cd # intrinsic unix command
+CHMOD = $(UNIXCOMMAND_PATH)chmod
+CMP = $(USRBIN_PATH)cmp
+COMPRESS = $(USRBIN_PATH)compress
+CP = $(UNIXCOMMAND_PATH)cp
+CPIO = $(UNIXCOMMAND_PATH)cpio
+CUT = $(USRBIN_PATH)cut
+DATE = $(UNIXCOMMAND_PATH)date
+DF = $(UNIXCOMMAND_PATH)df
+DIFF = $(USRBIN_PATH)diff
+DIRNAME = $(USRBIN_PATH)dirname
+ECHO = echo # intrinsic unix command, with backslash-escaped character interpretation
+EGREP = $(UNIXCOMMAND_PATH)egrep
+EXPR = $(USRBIN_PATH)expr
+
+FIND = $(UNIXCOMMAND_PATH)find
+
+HEAD = $(USRBIN_PATH)head
+GREP = $(UNIXCOMMAND_PATH)grep
+GUNZIP = $(UNIXCOMMAND_PATH)gunzip
+LEX = $(USRBIN_PATH)lex
+LN = $(UNIXCOMMAND_PATH)ln
+LS = $(UNIXCOMMAND_PATH)ls
+M4 = $(USRBIN_PATH)m4
+MKDIR = $(UNIXCOMMAND_PATH)mkdir
+MV = $(UNIXCOMMAND_PATH)mv
+NAWK = $(USRBIN_PATH)awk
+PWD = $(UNIXCOMMAND_PATH)pwd
+#RM is defined by GNU Make as 'rm -f'
+RMDIR = $(UNIXCOMMAND_PATH)rmdir
+RPM = $(UNIXCOMMAND_PATH)rpm
+SED = $(UNIXCOMMAND_PATH)sed
+SH = $(UNIXCOMMAND_PATH)sh
+SORT = $(UNIXCOMMAND_PATH)sort
+STRIP = $(USRBIN_PATH)strip
+TAIL = $(USRBIN_PATH)tail
+
+TAR = tar # We need GNU TAR which must be found trough PATH (may be in /opt/freeware/bin or /usr/local/bin)
+
+TEST = $(USRBIN_PATH)test
+TOUCH = $(UNIXCOMMAND_PATH)touch
+TR = $(USRBIN_PATH)tr
+TRUE = $(UNIXCOMMAND_PATH)true
+UNAME = $(UNIXCOMMAND_PATH)uname
+UNIQ = $(USRBIN_PATH)uniq
+UNZIPSFX = $(USRBIN_PATH)unzipsfx
+YACC = $(USRBIN_PATH)yacc
+
+ZIPEXE = zip # Must be found trough PATH (may be in /opt/freeware/bin or /usr/local/bin)
+
+OS_VERSION = $(shell $(UNAME) -v)
+OS_NAME = aix
+
+ARCH_DATA_MODEL=64
+
+LIBARCH = ppc64
+
+# Value of Java os.arch property
+ARCHPROP = $(LIBARCH)
+
+BINDIR = $(OUTPUTDIR)/bin
+
+# where is unwanted output to be delivered?
+DEV_NULL = /dev/null
+export DEV_NULL
+
+CLASSPATH_SEPARATOR = :
+
+ifndef PLATFORM_SRC
+ PLATFORM_SRC = $(BUILDDIR)/../src/solaris
+endif # PLATFORM_SRC
+
+# Location of the various .properties files specific to Linux platform
+ifndef PLATFORM_PROPERTIES
+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib
+endif # PLATFORM_SRC
+
+# Platform specific closed sources
+ifndef OPENJDK
+ ifndef CLOSED_PLATFORM_SRC
+ CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
+ endif
+endif
+
+# platform specific include files
+PLATFORM_INCLUDE_NAME = $(PLATFORM)
+PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
+
+# OBJECT_SUFFIX, LIBRARY_SUFFIX, EXE_SUFFICS etc. are set in
+# j2se/make/common/shared/Platform.gmk . Just override those which differ for AIX.
+# suffix used for make dependencies files.
+# -qmakedep outputs .u, not .d
+override DEPEND_SUFFIX = u
+# suffix used for lint files
+LINT_SUFFIX = ln
+# The suffix applied to the library name for FDLIBM
+FDDLIBM_SUFFIX = a
+# The suffix applied to scripts (.bat for windows, nothing for unix)
+SCRIPT_SUFFIX =
+# CC compiler object code output directive flag value
+CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
+CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
+
+# On AIX we don't have any issues using javah and javah_g.
+JAVAH_SUFFIX = $(SUFFIX)
+
+#
+# Default optimization
+#
+
+ifndef OPTIMIZATION_LEVEL
+ ifeq ($(PRODUCT), java)
+ OPTIMIZATION_LEVEL = HIGHER
+ else
+ OPTIMIZATION_LEVEL = LOWER
+ endif
+endif
+ifndef FASTDEBUG_OPTIMIZATION_LEVEL
+ FASTDEBUG_OPTIMIZATION_LEVEL = LOWER
+endif
+
+CC_OPT/LOWER = -O2
+CC_OPT/HIGHER = -O3
+
+CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
+
+#
+# Selection of warning messages
+#
+CFLAGS_SHARED_OPTION=-qmkshrobj
+CXXFLAGS_SHARED_OPTION=-qmkshrobj
+
+#
+# If -Xa is in CFLAGS_COMMON it will end up ahead of $(POPT) for the
+# optimized build, and that ordering of the flags completely freaks
+# out cc. Hence, -Xa is instead in each CFLAGS variant.
+# The extra options to the C++ compiler prevent it from:
+# - adding runpath (dump -Lv) to *your* C++ compile install dir
+# - adding stubs to various things such as thr_getspecific (hence -nolib)
+# - creating Templates.DB in current directory (arch specific)
+CFLAGS_COMMON = -qchars=signed
+PIC_CODE_LARGE = -qpic=large
+PIC_CODE_SMALL = -qpic=small
+GLOBAL_KPIC = $(PIC_CODE_LARGE)
+CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
+# save compiler options into object file
+CFLAGS_COMMON += -qsaveopt
+
+# preserve absolute source file infos in debug infos
+CFLAGS_COMMON += -qfullpath
+
+# We want to be able to debug an opt build as well.
+CFLAGS_OPT = -g $(POPT)
+CFLAGS_DBG = -g
+
+CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
+# We want to be able to debug an opt build as well.
+CXXFLAGS_OPT = -g $(POPT)
+CXXFLAGS_DBG = -g
+
+# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
+ifeq ($(FASTDEBUG), true)
+ CFLAGS_DBG += -O2
+ CXXFLAGS_DBG += -O2
+endif
+
+CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
+
+# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
+ifneq ($(ARCH),alpha)
+ CPP_ARCH_FLAGS += -D$(ARCH)
+else
+ CPP_ARCH_FLAGS += -D_$(ARCH)_
+endif
+
More information about the distro-pkg-dev
mailing list