/hg/icedtea7-forest/jdk: 61 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Jul 27 15:49:52 UTC 2017


changeset 7bac544ea453 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=7bac544ea453
author: goetz
date: Tue Feb 28 12:12:33 2017 +0100

	8175163: [bsd] Fix build after "8005629: javac warnings compiling java.awt.EventDispatchThread..."
	Reviewed-by: andrew


changeset 28c5423c145d in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=28c5423c145d
author: goetz
date: Thu Feb 16 19:27:01 2017 +0100

	8175087: [bsd] Fix build after "8024900: PPC64: Enable new build on AIX (jdk part)"
	Reviewed-by: andrew


changeset 39e562959313 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=39e562959313
author: igerasim
date: Thu Apr 20 04:25:30 2017 +0100

	6474807: (smartcardio) CardTerminal.connect() throws CardException instead of CardNotPresentException
	Reviewed-by: valeriep


changeset 06fe19e58f81 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=06fe19e58f81
author: mcherkas
date: Wed Mar 06 20:10:04 2013 +0400

	8007295: Reduce number of warnings in awt classes
	Reviewed-by: bae, anthony


changeset ef86adcabe4c in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=ef86adcabe4c
author: serb
date: Fri Jul 15 19:25:06 2011 +0400

	4717864: setFont() does not update Fonts of Menus already on screen
	Reviewed-by: art, bagiras


changeset ec5259fc4b04 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=ec5259fc4b04
author: bae
date: Fri Apr 24 19:44:15 2015 +0300

	8076455: IME Composition Window is displayed on incorrect position
	Reviewed-by: serb, azvegint


changeset 34888f07a385 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=34888f07a385
author: mcherkas
date: Thu Apr 20 04:46:07 2017 +0100

	8167110: Windows peering issue
	7155957: closed/java/awt/MenuBar/MenuBarStress1/MenuBarStress1.java hangs on win 64 bit with jdk8
	8079595: Resizing dialog which is JWindow parent makes JVM crash
	8147842: IME Composition Window is displayed at incorrect location
	Reviewed-by: serb


changeset e13b17f95b16 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e13b17f95b16
author: vtewari
date: Tue Apr 05 17:07:56 2016 +0100

	7167293: FtpURLConnection connection leak on FileNotFoundException
	Reviewed-by: chegar, rriggs


changeset 7210793e4d38 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=7210793e4d38
author: serb
date: Thu Apr 20 05:42:22 2017 +0100

	7160627: [macosx] TextArea has wrong initial size
	7124213: [macosx] pack() does ignore size of a component; doesn't on the other platforms
	Reviewed-by: anthony, art


changeset 27d1a949ebf8 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=27d1a949ebf8
author: serb
date: Thu Apr 20 06:06:08 2017 +0100

	8005255: [macosx] Cleanup warnings in sun.lwawt
	Reviewed-by: alexsch, anthony


changeset b957106dd73f in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=b957106dd73f
author: pchelko
date: Thu Apr 20 06:12:51 2017 +0100

	8035568: [macosx] Cursor management unification
	Reviewed-by: anthony, serb


changeset 0f6def68b385 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=0f6def68b385
author: mcherkas
date: Wed Jan 25 18:16:48 2017 +0300

	8130769: The new menu can't be shown on the menubar after clicking the "Add" button.
	Reviewed-by: serb


changeset e1ec864c1548 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e1ec864c1548
author: chegar
date: Thu Apr 20 06:26:56 2017 +0100

	7197203: sun/misc/URLClassPath/ClassnameCharTest.sh failed, compile error
	Reviewed-by: alanb


changeset c630b72e39d9 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=c630b72e39d9
author: snikandrova
date: Thu Aug 18 16:27:15 2016 +0300

	8146602: jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java test fails with NullPointerException
	Reviewed-by: dfuchs, clanger


changeset d10eca2409d4 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d10eca2409d4
author: rriggs
date: Thu Apr 20 06:33:08 2017 +0100

	8066504: GetVersionEx in java.base/windows/native/libjava/java_props_md.c might not get correct Windows version 0
	Summary: System property os.name and os.version should report the version of kernel32.dll
	Reviewed-by: alanb, igerasim


changeset 40e025740ded in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=40e025740ded
author: msolovie
date: Thu Apr 20 06:34:16 2017 +0100

	8150490: Update OS detection code to recognize Windows Server 2016
	Reviewed-by: mgronlun, alanb, dholmes


changeset 6074514aeaab in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=6074514aeaab
author: mcherkas
date: Thu Jan 26 17:26:29 2017 +0300

	8161195: Regression: closed/javax/swing/text/FlowView/LayoutTest.java
	Reviewed-by: serb


changeset 785e8ea35d36 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=785e8ea35d36
author: snikandrova
date: Mon Aug 08 20:16:53 2016 +0300

	8162876: [TEST_BUG] sun/net/www/protocol/http/HttpInputStream.java fails intermittently
	Reviewed-by: chegar


changeset 66269dd2d33f in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=66269dd2d33f
author: weijun
date: Wed Jul 09 15:10:42 2014 +0800

	7150092: NTLM authentication fail if user specified a different realm
	Reviewed-by: michaelm


changeset d4266a3f85a6 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d4266a3f85a6
author: dfuchs
date: Thu Apr 20 07:09:08 2017 +0100

	8163520: Reuse cache entries
	Reviewed-by: chegar, aefimov


changeset 32c7a748163c in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=32c7a748163c
author: valeriep
date: Thu Apr 20 16:42:00 2017 +0100

	8163528: Better library loading
	Reviewed-by: mullan
	Contributed-by: florian at bogner.sh


changeset ca9a077974d5 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=ca9a077974d5
author: snikandrova
date: Mon Aug 29 20:55:06 2016 +0300

	8164533: sun/security/ssl/SSLSocketImpl/CloseSocket.java failed with "Error while cleaning up threads after test"
	Reviewed-by: xuelei


changeset fea29ee2099c in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=fea29ee2099c
author: pchelko
date: Thu Apr 20 16:51:31 2017 +0100

	8027025: [macosx] getLocationOnScreen returns 0 if parent invisible
	Reviewed-by: anthony, serb


changeset 794fa1fde9e9 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=794fa1fde9e9
author: alexsch
date: Thu Apr 20 20:28:44 2017 +0100

	8011059: [macosx] Support automatic @2x images loading on Mac OS X
	Reviewed-by: serb, flar


changeset b86ab588efc5 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=b86ab588efc5
author: anthony
date: Thu Apr 20 21:23:52 2017 +0100

	7148275: [macosx] setIconImages() not working correctly (distorted icon when minimized)
	Summary: Pass all images provided by user code to the system and let it do the right thing
	Reviewed-by: art, swingler


changeset d08745a5cfab in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d08745a5cfab
author: anthony
date: Thu Apr 20 21:25:01 2017 +0100

	7168851: [macosx] Netbeans crashes in CImage.nativeCreateNSImageFromArray
	Summary: Eliminate unnecessary -release call
	Reviewed-by: dcherepanov


changeset 7a4e51757d72 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=7a4e51757d72
author: alexsch
date: Thu Jan 30 15:08:35 2014 +0400

	8028212: Custom cursor HiDPI support
	Reviewed-by: serb, anthony


changeset f65a89b658b0 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f65a89b658b0
author: pchelko
date: Thu Apr 20 21:45:12 2017 +0100

	7154841: [macosx] Popups appear behind taskbar
	Reviewed-by: anthony, serb


changeset c0e54420fccf in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=c0e54420fccf
author: serb
date: Thu Apr 20 22:22:02 2017 +0100

	8033786: White flashing when opening Dialogs and Menus using Nimbus with dark background
	Reviewed-by: alexsch, anthony


changeset 295b149be8cd in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=295b149be8cd
author: serb
date: Thu Apr 20 23:14:57 2017 +0100

	7124552: [macosx] NullPointerException in getBufferStrategy()
	7124219: [macosx] Unable to draw images to fullscreen
	Reviewed-by: bae, anthony


changeset 6e0226f8b489 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=6e0226f8b489
author: dmarkov
date: Tue May 17 13:12:50 2016 +0300

	8080729: [macosx] java 7 and 8 JDialogs on multiscreen jump to parent frame on focus
	Reviewed-by: ant, denis


changeset 2cdc473fc6bc in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=2cdc473fc6bc
author: serb
date: Tue Sep 23 07:13:34 2014 +0400

	8041734: JFrame in full screen mode leaves empty workspace after close
	Reviewed-by: azvegint, alexsch


changeset 81d30fd2e5c4 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=81d30fd2e5c4
author: alexsch
date: Fri Apr 21 00:30:48 2017 +0100

	8024926: [macosx] AquaIcon HiDPI support
	Reviewed-by: serb, anthony


changeset 5d3e68b7c1cf in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=5d3e68b7c1cf
author: alexsch
date: Fri Apr 21 00:41:00 2017 +0100

	8031573: [macosx] Checkmarks of JCheckBoxMenuItems aren't rendered in high resolution on Retina
	Reviewed-by: serb, pchelko


changeset 4e12cba33eaa in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4e12cba33eaa
author: alexsch
date: Tue Apr 01 13:10:06 2014 +0400

	8033534: [macosx] Get MultiResolution image from native system
	Reviewed-by: serb, pchelko


changeset d2a734cc9752 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d2a734cc9752
author: mcherkas
date: Fri Apr 21 05:47:49 2017 +0100

	8165626: Improved window framing
	Reviewed-by: serb


changeset 30d17dc1d9fe in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=30d17dc1d9fe
author: aefimov
date: Mon Oct 24 17:02:34 2016 +0300

	8167179: Make XSL generated namespace prefixes local to transformation process
	Reviewed-by: joehw


changeset 310499d83a24 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=310499d83a24
author: robm
date: Mon Jan 09 18:33:02 2017 +0000

	8169465: Deadlock in com.sun.jndi.ldap.pool.Connections
	Reviewed-by: dfuchs, vtewari


changeset f2d639848a0e in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f2d639848a0e
author: dmarkov
date: Fri Apr 21 06:21:45 2017 +0100

	8169589: [macosx] Activating a JDialog puts to back another dialog
	Reviewed-by: anthony, serb


changeset 7cc2d987a269 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=7cc2d987a269
author: rpatil
date: Fri Apr 21 06:28:12 2017 +0100

	8170222: Better transfers of files
	Reviewed-by: dfuchs, chegar, vtewari


changeset 815d05b1ba7d in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=815d05b1ba7d
author: rpatil
date: Fri Apr 21 06:33:53 2017 +0100

	8170316: (tz) Support tzdata2016j
	Reviewed-by: martin, okutsu


changeset 7ce6f30c4fbd in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=7ce6f30c4fbd
author: aefimov
date: Tue Jan 17 15:35:57 2017 +0300

	8170814: Reuse cache entries (part II)
	Reviewed-by: dfuchs


changeset 797914a333ca in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=797914a333ca
author: rpatil
date: Mon Dec 26 16:00:45 2016 +0530

	8171121: Enhancing jar checking
	Reviewed-by: ascarpino


changeset 82dac06ce388 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=82dac06ce388
author: robm
date: Fri Dec 16 20:39:07 2016 +0000

	8171388: Update JNDI Thread contexts
	Reviewed-by: chegar


changeset f32656a789b8 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f32656a789b8
author: rpatil
date: Fri Apr 21 06:53:01 2017 +0100

	8171533: Better email transfer
	Reviewed-by: dfuchs, chegar, vtewari


changeset ac2ad7826248 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=ac2ad7826248
author: dmarkov
date: Fri Apr 21 06:55:52 2017 +0100

	8171949: [macosx] AWT_ZoomFrame Automated tests fail with error: The bitwise mask Frame.ICONIFIED is not setwhen the frame is in ICONIFIED state
	Reviewed-by: ssadetsky, serb


changeset 28d28fee65c9 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=28d28fee65c9
author: dmarkov
date: Fri Apr 21 06:59:56 2017 +0100

	8171952: [macosx] AWT_Modality/Automated/ModalExclusion/NoExclusion/ModelessDialog test fails as DummyButton on Dialog did not gain focus when clicked.
	Reviewed-by: ssadetsky, serb


changeset 114315e4d4cc in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=114315e4d4cc
author: robm
date: Thu Feb 09 16:34:22 2017 +0000

	8172299: Improve class processing
	Reviewed-by: rriggs


changeset e16c91d1c84a in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e16c91d1c84a
author: coffeys
date: Fri Apr 21 07:20:10 2017 +0100

	8173783: IllegalArgumentException: jdk.tls.namedGroups
	Reviewed-by: xuelei, wetmore


changeset aba55b4cc887 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=aba55b4cc887
author: mfang
date: Fri Apr 21 07:41:17 2017 +0100

	8025974: l10n for policytool
	Reviewed-by: naoto, leifs, yhuang


changeset 9c7429c36256 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=9c7429c36256
author: andrew
date: Thu Apr 27 03:33:48 2017 +0100

	8078668: jar usage string mentions unsupported option '-n'
	Reviewed-by: omajid


changeset 1f445c338a14 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=1f445c338a14
author: mfang
date: Thu Apr 27 03:46:55 2017 +0100

	8133357: 8u65 l10n resource file translation update
	Reviewed-by: yhuang


changeset 0f15cc93f038 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=0f15cc93f038
author: asaha
date: Fri Apr 21 08:28:49 2017 +0100

	8173931: 8u131 L10n resource file update
	Reviewed-by: coffeys
	Contributed-by: li.jiang at oracle.com


changeset 26c2863537f1 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=26c2863537f1
author: robm
date: Mon Feb 27 17:43:34 2017 +0000

	8174844: Incorrect GPL header causes RE script to miss swap to commercial header for licensee source bundle
	Reviewed-by: coffeys


changeset a2757d3dc8d7 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a2757d3dc8d7
author: aefimov
date: Tue Feb 28 14:44:01 2017 +0300

	8174985: NTLM authentication doesn't work with IIS if NTLM cache is disabled
	Reviewed-by: dfuchs


changeset e890a6aef622 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e890a6aef622
author: rpatil
date: Fri Apr 21 08:49:34 2017 +0100

	8176044: (tz) Support tzdata2017a
	Reviewed-by: naoto


changeset a319566e15f5 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a319566e15f5
author: andrew
date: Thu Apr 27 03:48:04 2017 +0100

	Added tag jdk7u141-b00 for changeset e890a6aef622


changeset d67fe3d3ea92 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d67fe3d3ea92
author: andrew
date: Thu Apr 27 06:11:44 2017 +0100

	Added tag jdk7u141-b01 for changeset a319566e15f5


changeset 19a085e65614 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=19a085e65614
author: mcherkas
date: Wed Apr 03 20:42:55 2013 +0400

	8011123: serialVersionUID of java.awt.dnd.InvalidDnDOperationException changed in JDK8-b82
	Reviewed-by: anthony, serb


changeset 5af12d99fb1e in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=5af12d99fb1e
author: andrew
date: Fri Jul 14 00:56:29 2017 +0100

	Merge jdk7u141-b02


changeset 45e35cd6fd73 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=45e35cd6fd73
author: andrew
date: Thu Jul 27 16:57:30 2017 +0100

	Added tag icedtea-2.7.0pre12 for changeset 5af12d99fb1e


diffstat:

 .hgtags                                                                                         |    59 +-
 .jcheck/conf                                                                                    |     2 -
 make/com/sun/java/pack/Makefile                                                                 |     7 +-
 make/com/sun/nio/Makefile                                                                       |     2 +-
 make/com/sun/nio/sctp/Makefile                                                                  |    17 +-
 make/com/sun/security/auth/module/Makefile                                                      |     4 -
 make/common/Defs-embedded.gmk                                                                   |     4 +-
 make/common/Defs-linux.gmk                                                                      |    67 +-
 make/common/Defs-macosx.gmk                                                                     |     5 +
 make/common/Defs.gmk                                                                            |    24 +-
 make/common/Demo.gmk                                                                            |     2 +-
 make/common/Library.gmk                                                                         |    42 +-
 make/common/Program.gmk                                                                         |    91 +-
 make/common/Release.gmk                                                                         |    54 +-
 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                                                                 |    14 +-
 make/common/shared/Sanity.gmk                                                                   |     8 +
 make/docs/Makefile                                                                              |     6 +-
 make/java/instrument/Makefile                                                                   |     6 +-
 make/java/java/FILES_c.gmk                                                                      |     1 -
 make/java/java/Makefile                                                                         |     2 +-
 make/java/java/mapfile-vers                                                                     |     6 -
 make/java/main/java/mapfile-aarch64                                                             |    39 +
 make/java/net/FILES_c.gmk                                                                       |     8 +-
 make/java/net/Makefile                                                                          |    30 +-
 make/java/net/mapfile-vers                                                                      |     5 +-
 make/java/nio/Makefile                                                                          |   270 +-
 make/java/security/Makefile                                                                     |    12 +-
 make/java/sun_nio/Makefile                                                                      |     2 +-
 make/java/version/Makefile                                                                      |     5 +
 make/javax/crypto/Makefile                                                                      |    74 +-
 make/javax/sound/SoundDefs.gmk                                                                  |    72 +-
 make/jdk_generic_profile.sh                                                                     |   318 +-
 make/mkdemo/jvmti/waiters/Makefile                                                              |     4 +
 make/sun/Makefile                                                                               |     2 +-
 make/sun/awt/FILES_c_unix.gmk                                                                   |    10 +
 make/sun/awt/Makefile                                                                           |     9 +-
 make/sun/awt/mawt.gmk                                                                           |    40 +-
 make/sun/cmm/lcms/FILES_c_unix.gmk                                                              |     7 +-
 make/sun/cmm/lcms/Makefile                                                                      |    11 +-
 make/sun/cmm/lcms/mapfile-vers                                                                  |    12 +-
 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                                                                           |    84 +
 make/sun/gtk/mapfile-vers                                                                       |    72 +
 make/sun/javazic/tzdata/VERSION                                                                 |     2 +-
 make/sun/javazic/tzdata/africa                                                                  |   103 +-
 make/sun/javazic/tzdata/antarctica                                                              |     3 +-
 make/sun/javazic/tzdata/asia                                                                    |   401 +-
 make/sun/javazic/tzdata/australasia                                                             |   159 +-
 make/sun/javazic/tzdata/backward                                                                |     1 +
 make/sun/javazic/tzdata/europe                                                                  |   230 +-
 make/sun/javazic/tzdata/iso3166.tab                                                             |     2 +-
 make/sun/javazic/tzdata/leapseconds                                                             |     4 +-
 make/sun/javazic/tzdata/northamerica                                                            |    87 +-
 make/sun/javazic/tzdata/southamerica                                                            |   554 +-
 make/sun/javazic/tzdata/zone.tab                                                                |    12 +-
 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                                                          |     2 -
 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                                                                      |    18 +-
 make/sun/security/ec/Makefile                                                                   |    30 +-
 make/sun/security/ec/mapfile-vers                                                               |     2 +
 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/smartcardio/Makefile                                                          |    17 +-
 make/sun/splashscreen/FILES_c.gmk                                                               |    84 +-
 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                                                                          |    64 +-
 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                       |    64 +-
 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/bsd/doc/man/jhat.1                                                                          |     4 +-
 src/linux/doc/man/jhat.1                                                                        |     4 +-
 src/macosx/classes/com/apple/eawt/_AppDockIconHandler.java                                      |    20 +-
 src/macosx/classes/com/apple/laf/AquaIcon.java                                                  |     9 +-
 src/macosx/classes/com/apple/laf/AquaImageFactory.java                                          |    97 +-
 src/macosx/classes/com/apple/laf/AquaUtils.java                                                 |    13 +-
 src/macosx/classes/com/apple/laf/resources/aqua_de.properties                                   |    12 +-
 src/macosx/classes/com/apple/laf/resources/aqua_sv.properties                                   |     2 +-
 src/macosx/classes/sun/awt/CGraphicsConfig.java                                                 |    81 +-
 src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java                                     |   180 +-
 src/macosx/classes/sun/java2d/opengl/CGLLayer.java                                              |    21 +-
 src/macosx/classes/sun/lwawt/LWButtonPeer.java                                                  |     9 +-
 src/macosx/classes/sun/lwawt/LWCanvasPeer.java                                                  |    90 +-
 src/macosx/classes/sun/lwawt/LWCheckboxPeer.java                                                |    17 +-
 src/macosx/classes/sun/lwawt/LWChoicePeer.java                                                  |     7 +-
 src/macosx/classes/sun/lwawt/LWComponentPeer.java                                               |   257 +-
 src/macosx/classes/sun/lwawt/LWContainerPeer.java                                               |    97 +-
 src/macosx/classes/sun/lwawt/LWCursorManager.java                                               |     6 +-
 src/macosx/classes/sun/lwawt/LWGraphicsConfig.java                                              |    97 +
 src/macosx/classes/sun/lwawt/LWLabelPeer.java                                                   |    31 +-
 src/macosx/classes/sun/lwawt/LWListPeer.java                                                    |    90 +-
 src/macosx/classes/sun/lwawt/LWMouseInfoPeer.java                                               |    15 +-
 src/macosx/classes/sun/lwawt/LWPanelPeer.java                                                   |    14 +-
 src/macosx/classes/sun/lwawt/LWRepaintArea.java                                                 |    25 +-
 src/macosx/classes/sun/lwawt/LWScrollBarPeer.java                                               |    16 +-
 src/macosx/classes/sun/lwawt/LWScrollPanePeer.java                                              |    20 +-
 src/macosx/classes/sun/lwawt/LWTextAreaPeer.java                                                |    58 +-
 src/macosx/classes/sun/lwawt/LWTextComponentPeer.java                                           |    25 +-
 src/macosx/classes/sun/lwawt/LWTextFieldPeer.java                                               |    22 +-
 src/macosx/classes/sun/lwawt/LWToolkit.java                                                     |    18 +-
 src/macosx/classes/sun/lwawt/LWWindowPeer.java                                                  |   207 +-
 src/macosx/classes/sun/lwawt/PlatformWindow.java                                                |    13 -
 src/macosx/classes/sun/lwawt/SelectionClearListener.java                                        |    34 -
 src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java                                          |    16 +-
 src/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java                                     |    52 +-
 src/macosx/classes/sun/lwawt/macosx/CImage.java                                                 |   128 +-
 src/macosx/classes/sun/lwawt/macosx/CMenuItem.java                                              |    17 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java                                     |    12 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java                                 |    24 -
 src/macosx/classes/sun/lwawt/macosx/CPlatformView.java                                          |    86 +-
 src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java                                        |   653 +-
 src/macosx/classes/sun/lwawt/macosx/CRobot.java                                                 |    33 +-
 src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java                                              |    39 +-
 src/macosx/classes/sun/lwawt/macosx/CViewPlatformEmbeddedFrame.java                             |    31 +-
 src/macosx/classes/sun/lwawt/macosx/CWarningWindow.java                                         |    52 +-
 src/macosx/classes/sun/lwawt/macosx/CWrapper.java                                               |    32 +-
 src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java                                             |    65 +-
 src/macosx/native/sun/awt/AWTSurfaceLayers.h                                                    |     2 +
 src/macosx/native/sun/awt/AWTSurfaceLayers.m                                                    |     6 +-
 src/macosx/native/sun/awt/AWTWindow.h                                                           |     2 +
 src/macosx/native/sun/awt/AWTWindow.m                                                           |   161 +-
 src/macosx/native/sun/awt/CCursorManager.m                                                      |    12 +-
 src/macosx/native/sun/awt/CImage.m                                                              |   210 +-
 src/macosx/native/sun/awt/CRobot.m                                                              |    39 +-
 src/macosx/native/sun/awt/CWrapper.m                                                            |    50 +-
 src/share/back/ThreadGroupReferenceImpl.c                                                       |     2 +-
 src/share/back/invoker.c                                                                        |    94 +-
 src/share/back/outStream.c                                                                      |     4 +-
 src/share/bin/java.c                                                                            |     8 +-
 src/share/bin/wildcard.c                                                                        |     5 +
 src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java                               |     9 +-
 src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java                             |     9 +-
 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                                    |     7 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java                               |    24 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java                                     |     5 +-
 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties               |     2 +-
 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/jndi/ldap/Connection.java                                             |    22 +-
 src/share/classes/com/sun/jndi/ldap/LdapClient.java                                             |   113 +-
 src/share/classes/com/sun/jndi/ldap/LdapURL.java                                                |    64 +-
 src/share/classes/com/sun/jndi/ldap/pool/Connections.java                                       |    34 +-
 src/share/classes/com/sun/jndi/ldap/pool/Pool.java                                              |    26 +-
 src/share/classes/com/sun/media/sound/SoftSynthesizer.java                                      |    34 +
 src/share/classes/com/sun/naming/internal/ResourceManager.java                                  |    42 +-
 src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties                             |     4 +-
 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/ntlm/Client.java                                             |    31 +-
 src/share/classes/com/sun/security/ntlm/Server.java                                             |    10 +-
 src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java                                    |    12 +-
 src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java                                    |     6 +-
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties               |    14 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties               |     2 +-
 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties               |     2 +-
 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties               |     2 +-
 src/share/classes/java/awt/CheckboxMenuItem.java                                                |     2 +-
 src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java                              |     5 +-
 src/share/classes/java/awt/Cursor.java                                                          |    20 +-
 src/share/classes/java/awt/EventQueue.java                                                      |     6 +-
 src/share/classes/java/awt/MediaTracker.java                                                    |    48 +-
 src/share/classes/java/awt/Menu.java                                                            |    20 +-
 src/share/classes/java/awt/MenuBar.java                                                         |    18 +-
 src/share/classes/java/awt/MenuComponent.java                                                   |    16 +-
 src/share/classes/java/awt/MenuItem.java                                                        |     2 +-
 src/share/classes/java/awt/RenderingHints.java                                                  |     9 +-
 src/share/classes/java/awt/ScrollPane.java                                                      |     3 +-
 src/share/classes/java/awt/Window.java                                                          |     4 +
 src/share/classes/java/awt/color/ICC_Profile.java                                               |    80 +-
 src/share/classes/java/awt/color/ICC_ProfileGray.java                                           |     6 +-
 src/share/classes/java/awt/color/ICC_ProfileRGB.java                                            |     6 +-
 src/share/classes/java/awt/datatransfer/Clipboard.java                                          |     8 +-
 src/share/classes/java/awt/dnd/DragGestureEvent.java                                            |     7 +-
 src/share/classes/java/awt/dnd/DragGestureRecognizer.java                                       |     2 +-
 src/share/classes/java/awt/dnd/DragSource.java                                                  |     9 +-
 src/share/classes/java/awt/dnd/InvalidDnDOperationException.java                                |     2 +
 src/share/classes/java/awt/geom/AffineTransform.java                                            |    19 +
 src/share/classes/java/io/InputStream.java                                                      |     2 +-
 src/share/classes/java/io/ObjectInputStream.java                                                |    32 +-
 src/share/classes/java/lang/Thread.java                                                         |    13 +-
 src/share/classes/java/lang/reflect/WeakCache.java                                              |     8 +-
 src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java                                 |     6 +-
 src/share/classes/java/net/Inet4Address.java                                                    |     2 +
 src/share/classes/java/net/InetAddress.java                                                     |     2 +-
 src/share/classes/java/net/SocksSocketImpl.java                                                 |     4 +-
 src/share/classes/java/nio/Bits.java                                                            |   175 +-
 src/share/classes/java/security/Policy.java                                                     |     1 -
 src/share/classes/java/text/SimpleDateFormat.java                                               |     2 +-
 src/share/classes/java/util/Currency.java                                                       |    44 +-
 src/share/classes/java/util/CurrencyData.properties                                             |    20 +-
 src/share/classes/java/util/zip/Deflater.java                                                   |     4 +-
 src/share/classes/java/util/zip/ZStreamRef.java                                                 |     2 +-
 src/share/classes/java/util/zip/ZipFile.java                                                    |    39 +-
 src/share/classes/javax/crypto/Cipher.java                                                      |   172 +-
 src/share/classes/javax/sql/rowset/BaseRowSet.java                                              |     2 +-
 src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java                                      |    18 +-
 src/share/classes/javax/sql/rowset/RowSetWarning.java                                           |    23 +-
 src/share/classes/javax/swing/JComponent.java                                                   |    13 +-
 src/share/classes/javax/swing/JDialog.java                                                      |     4 +-
 src/share/classes/javax/swing/JEditorPane.java                                                  |     9 +-
 src/share/classes/javax/swing/JFrame.java                                                       |    10 +-
 src/share/classes/javax/swing/JInternalFrame.java                                               |     6 +-
 src/share/classes/javax/swing/JMenu.java                                                        |     3 +-
 src/share/classes/javax/swing/JPopupMenu.java                                                   |     8 +-
 src/share/classes/javax/swing/MenuSelectionManager.java                                         |     3 +-
 src/share/classes/javax/swing/PopupFactory.java                                                 |    14 +-
 src/share/classes/javax/swing/SortingFocusTraversalPolicy.java                                  |     5 +-
 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                                   |    50 +-
 src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java                                   |    29 +-
 src/share/classes/javax/swing/plaf/basic/BasicListUI.java                                       |     5 +-
 src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java                                  |    20 +-
 src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java                                |     2 +-
 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/sun/applet/AppletPanel.java                                                   |    10 +-
 src/share/classes/sun/applet/AppletViewerPanel.java                                             |    18 +-
 src/share/classes/sun/awt/AWTAccessor.java                                                      |    10 +-
 src/share/classes/sun/awt/SunHints.java                                                         |    27 +-
 src/share/classes/sun/awt/SunToolkit.java                                                       |   313 +-
 src/share/classes/sun/awt/TextureSizeConstraining.java                                          |    45 -
 src/share/classes/sun/awt/image/JPEGImageDecoder.java                                           |     2 +-
 src/share/classes/sun/awt/image/MultiResolutionBufferedImage.java                               |    76 +
 src/share/classes/sun/awt/image/MultiResolutionImage.java                                       |    83 +
 src/share/classes/sun/awt/image/MultiResolutionToolkitImage.java                                |   107 +
 src/share/classes/sun/awt/resources/awt_sv.properties                                           |     4 +-
 src/share/classes/sun/java2d/SunGraphics2D.java                                                 |   120 +-
 src/share/classes/sun/java2d/cmm/CMSManager.java                                                |    44 +-
 src/share/classes/sun/java2d/cmm/PCMM.java                                                      |    14 +-
 src/share/classes/sun/java2d/cmm/Profile.java                                                   |    43 +
 src/share/classes/sun/java2d/cmm/ProfileDataVerifier.java                                       |   114 +
 src/share/classes/sun/java2d/cmm/lcms/LCMS.java                                                 |   139 +-
 src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java                                      |   309 +-
 src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java                                          |   109 +
 src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java                                        |    65 +-
 src/share/classes/sun/launcher/resources/launcher_pt_BR.properties                              |     2 +-
 src/share/classes/sun/misc/Launcher.java                                                        |    20 +-
 src/share/classes/sun/misc/SharedSecrets.java                                                   |     7 +-
 src/share/classes/sun/misc/Unsafe.java                                                          |   415 +-
 src/share/classes/sun/misc/Version.java.template                                                |    58 +-
 src/share/classes/sun/net/ftp/impl/FtpClient.java                                               |    19 +-
 src/share/classes/sun/net/smtp/SmtpClient.java                                                  |    18 +-
 src/share/classes/sun/net/www/http/HttpClient.java                                              |    81 +-
 src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java                                |    36 +-
 src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java                             |    23 +-
 src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java                        |    47 +-
 src/share/classes/sun/nio/ch/FileChannelImpl.java                                               |     5 +-
 src/share/classes/sun/rmi/registry/RegistryImpl.java                                            |    16 +
 src/share/classes/sun/rmi/server/LoaderHandler.java                                             |     2 +-
 src/share/classes/sun/security/ec/SunEC.java                                                    |    19 +
 src/share/classes/sun/security/krb5/Config.java                                                 |    51 +-
 src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java                   |    90 +-
 src/share/classes/sun/security/pkcs11/Config.java                                               |     3 +
 src/share/classes/sun/security/pkcs11/P11Cipher.java                                            |   388 +-
 src/share/classes/sun/security/pkcs11/P11Util.java                                              |     2 +-
 src/share/classes/sun/security/pkcs11/Secmod.java                                               |    19 +-
 src/share/classes/sun/security/pkcs11/SessionManager.java                                       |    85 +-
 src/share/classes/sun/security/pkcs11/SunPKCS11.java                                            |    23 +-
 src/share/classes/sun/security/provider/ByteArrayAccess.java                                    |     9 +-
 src/share/classes/sun/security/provider/DSAParameterGenerator.java                              |     1 +
 src/share/classes/sun/security/provider/certpath/OCSP.java                                      |    18 +-
 src/share/classes/sun/security/smartcardio/TerminalImpl.java                                    |     6 +-
 src/share/classes/sun/security/ssl/ClientHandshaker.java                                        |   107 +-
 src/share/classes/sun/security/ssl/SSLEngineImpl.java                                           |    11 +
 src/share/classes/sun/security/ssl/ServerHandshaker.java                                        |     6 +-
 src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java                        |    23 +-
 src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java                                 |    19 +-
 src/share/classes/sun/security/tools/jarsigner/Resources_ja.java                                |    12 +-
 src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java                             |     4 +-
 src/share/classes/sun/security/tools/keytool/Resources_sv.java                                  |     6 +-
 src/share/classes/sun/security/tools/policytool/Resources_de.java                               |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_es.java                               |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_fr.java                               |    56 +-
 src/share/classes/sun/security/tools/policytool/Resources_it.java                               |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_ja.java                               |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_ko.java                               |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java                            |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_sv.java                               |    58 +-
 src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java                            |    54 +-
 src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java                            |    54 +-
 src/share/classes/sun/security/util/AbstractAlgorithmConstraints.java                           |     2 +-
 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/jar/resources/jar.properties                                        |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_de.properties                                     |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_es.properties                                     |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_fr.properties                                     |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_it.properties                                     |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_ja.properties                                     |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_ko.properties                                     |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties                                  |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_sv.properties                                     |     6 +-
 src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties                                  |     2 +-
 src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties                                  |     2 +-
 src/share/classes/sun/tools/native2ascii/Main.java                                              |     9 +-
 src/share/classes/sun/util/calendar/ZoneInfoFile.java                                           |    41 +-
 src/share/demo/java2d/J2DBench/build.xml                                                        |    14 +-
 src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg                           |   Bin 
 src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg                          |   Bin 
 src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg                           |   Bin 
 src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java                                       |     2 +
 src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/CMMTests.java                             |   153 +
 src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java                 |    60 +
 src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConvertOpTests.java                  |   383 +
 src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/DataConversionTests.java                  |   198 +
 src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java                 |   166 +
 src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ProfileTests.java                         |   132 +
 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/hprof_init.c                                                         |     2 +-
 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                                                      |     8 +-
 src/share/lib/security/java.security-macosx                                                     |     8 +-
 src/share/lib/security/java.security-solaris                                                    |     8 +-
 src/share/lib/security/java.security-windows                                                    |     8 +-
 src/share/lib/security/nss.cfg.in                                                               |     5 +
 src/share/native/com/sun/java/util/jar/pack/jni.cpp                                             |     6 +-
 src/share/native/com/sun/java/util/jar/pack/unpack.cpp                                          |     1 -
 src/share/native/com/sun/media/sound/SoundDefs.h                                                |    10 +
 src/share/native/java/net/InetAddress.c                                                         |     3 +
 src/share/native/java/net/net_util.c                                                            |     1 +
 src/share/native/java/net/net_util.h                                                            |     1 +
 src/share/native/java/nio/Bits.c                                                                |   278 -
 src/share/native/java/util/zip/Deflater.c                                                       |     6 +-
 src/share/native/java/util/zip/Inflater.c                                                       |     2 +-
 src/share/native/java/util/zip/zip_util.c                                                       |    18 +-
 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                                                  |  1390 ---
 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                                               |     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/splashscreen/splashscreen_gif.c                                        |    24 +-
 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                                                      |   255 +-
 src/share/native/sun/font/layout/CanonShaping.cpp                                               |    10 +
 src/share/native/sun/font/layout/IndicLayoutEngine.cpp                                          |     2 +-
 src/share/native/sun/font/layout/IndicReordering.cpp                                            |     6 +-
 src/share/native/sun/font/layout/IndicReordering.h                                              |     2 +-
 src/share/native/sun/font/layout/LayoutEngine.cpp                                               |     8 +
 src/share/native/sun/font/layout/SunLayoutEngine.cpp                                            |     4 +
 src/share/native/sun/java2d/cmm/lcms/LCMS.c                                                     |   545 +-
 src/share/native/sun/java2d/cmm/lcms/cmscgats.c                                                 |     2 +-
 src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c                                                 |    22 +-
 src/share/native/sun/java2d/cmm/lcms/cmserr.c                                                   |     9 +-
 src/share/native/sun/java2d/cmm/lcms/cmsintrp.c                                                 |     4 +-
 src/share/native/sun/java2d/cmm/lcms/cmsio0.c                                                   |    68 +-
 src/share/native/sun/java2d/cmm/lcms/cmsio1.c                                                   |    18 +-
 src/share/native/sun/java2d/cmm/lcms/cmslut.c                                                   |    16 +
 src/share/native/sun/java2d/cmm/lcms/cmsnamed.c                                                 |    10 +-
 src/share/native/sun/java2d/cmm/lcms/cmsopt.c                                                   |   218 +-
 src/share/native/sun/java2d/cmm/lcms/cmspack.c                                                  |   431 +-
 src/share/native/sun/java2d/cmm/lcms/cmspcs.c                                                   |     9 +
 src/share/native/sun/java2d/cmm/lcms/cmsplugin.c                                                |    21 +-
 src/share/native/sun/java2d/cmm/lcms/cmssamp.c                                                  |    27 +-
 src/share/native/sun/java2d/cmm/lcms/cmstypes.c                                                 |     6 +-
 src/share/native/sun/java2d/cmm/lcms/cmsvirt.c                                                  |    37 +-
 src/share/native/sun/java2d/cmm/lcms/cmsxform.c                                                 |    66 +-
 src/share/native/sun/java2d/cmm/lcms/lcms2.h                                                    |    42 +-
 src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h                                           |    24 +-
 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/security/ec/ECC_JNI.cpp                                                    |   125 +-
 src/share/native/sun/security/ec/ecc_impl.h                                                     |   298 +
 src/share/native/sun/security/ec/impl/ecc_impl.h                                                |   271 -
 src/share/native/sun/security/jgss/wrapper/GSSLibStub.c                                         |    49 +-
 src/share/native/sun/security/jgss/wrapper/NativeUtil.c                                         |    12 +
 src/share/native/sun/security/pkcs11/wrapper/p11_convert.c                                      |    48 +-
 src/share/native/sun/security/pkcs11/wrapper/p11_digest.c                                       |     4 +-
 src/share/native/sun/security/pkcs11/wrapper/p11_dual.c                                         |     8 +-
 src/share/native/sun/security/pkcs11/wrapper/p11_general.c                                      |     7 +-
 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                                     |    12 +-
 src/share/native/sun/security/pkcs11/wrapper/p11_sign.c                                         |    20 +-
 src/share/native/sun/security/pkcs11/wrapper/p11_util.c                                         |    86 +-
 src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h                                    |     3 +-
 src/share/npt/npt.h                                                                             |     8 +-
 src/solaris/bin/aarch64/jvm.cfg                                                                 |    36 +
 src/solaris/bin/java_md_solinux.c                                                               |     2 +
 src/solaris/bin/ppc64le/jvm.cfg                                                                 |    33 +
 src/solaris/classes/java/net/PlainDatagramSocketImpl.java                                       |     4 +-
 src/solaris/classes/sun/awt/UNIXToolkit.java                                                    |     6 +
 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                                                   |    30 +-
 src/solaris/classes/sun/awt/X11/XWM.java                                                        |    26 +-
 src/solaris/classes/sun/awt/X11/XWindowPeer.java                                                |     2 +
 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.10.properties                   |   377 +
 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.11.properties                   |   420 +
 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.12.properties                   |   420 +
 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.9.properties                    |   377 +
 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties                      |    73 +-
 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties                      |   385 +
 src/solaris/classes/sun/awt/motif/MFontConfiguration.java                                       |     3 +
 src/solaris/classes/sun/java2d/xr/XRRenderer.java                                               |    75 +-
 src/solaris/classes/sun/java2d/xr/XRUtils.java                                                  |     4 +-
 src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java                                  |     9 +
 src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java                      |    23 +-
 src/solaris/classes/sun/nio/ch/SctpChannelImpl.java                                             |     2 +-
 src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java                                        |     2 +-
 src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java                                       |     2 +-
 src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java                                       |     2 +-
 src/solaris/classes/sun/nio/fs/UnixFileStore.java                                               |     5 +-
 src/solaris/classes/sun/print/UnixPrintServiceLookup.java                                       |     2 +-
 src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java                                  |    89 +-
 src/solaris/doc/sun/man/man1/jhat.1                                                             |     4 +-
 src/solaris/javavm/export/jni_md.h                                                              |    18 +-
 src/solaris/native/com/sun/management/LinuxOperatingSystem.c                                    |    27 +-
 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                                         |    61 +
 src/solaris/native/common/deps/glib2/gio_fp.c                                                   |   183 +
 src/solaris/native/common/deps/glib2/gio_fp.h                                                   |    69 +
 src/solaris/native/common/deps/glib2/glib_fp.h                                                  |    70 +
 src/solaris/native/common/deps/gtk2/gtk/gtk.h                                                   |   567 +
 src/solaris/native/common/deps/gtk2/gtk_fp.c                                                    |   367 +
 src/solaris/native/common/deps/gtk2/gtk_fp.h                                                    |   460 +
 src/solaris/native/common/deps/gtk2/gtk_fp_check.c                                              |    56 +
 src/solaris/native/common/deps/gtk2/gtk_fp_check.h                                              |    47 +
 src/solaris/native/common/deps/syscalls_fp.c                                                    |   122 +
 src/solaris/native/common/deps/syscalls_fp.h                                                    |    79 +
 src/solaris/native/java/lang/java_props_md.c                                                    |     7 +-
 src/solaris/native/java/net/AbstractPlainDatagramSocketImpl.c                                   |    89 -
 src/solaris/native/java/net/NetworkInterface.c                                                  |     5 +-
 src/solaris/native/java/net/PlainDatagramSocketImpl.c                                           |    35 +-
 src/solaris/native/java/util/TimeZone_md.c                                                      |    58 +
 src/solaris/native/sun/awt/CUPSfuncs.c                                                          |   137 +-
 src/solaris/native/sun/awt/awt_Font.c                                                           |     2 +-
 src/solaris/native/sun/awt/awt_GTKToolkit.c                                                     |   229 +
 src/solaris/native/sun/awt/awt_GraphicsEnv.c                                                    |     2 +-
 src/solaris/native/sun/awt/awt_LoadLibrary.c                                                    |     6 +-
 src/solaris/native/sun/awt/awt_Robot.c                                                          |    33 +
 src/solaris/native/sun/awt/awt_UNIXToolkit.c                                                    |   200 +-
 src/solaris/native/sun/awt/fontconfig.h                                                         |   941 --
 src/solaris/native/sun/awt/fontpath.c                                                           |   428 +-
 src/solaris/native/sun/awt/gtk2_interface.c                                                     |   996 +-
 src/solaris/native/sun/awt/gtk2_interface.h                                                     |   592 +-
 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/net/spi/DefaultProxySelector.c                                           |   493 +-
 src/solaris/native/sun/nio/ch/EPollArrayWrapper.c                                               |     1 -
 src/solaris/native/sun/nio/ch/Sctp.h                                                            |    25 +-
 src/solaris/native/sun/nio/ch/SctpNet.c                                                         |     6 +-
 src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c                                           |   134 +-
 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                                            |     5 +-
 src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h                                         |     5 +
 src/solaris/native/sun/security/smartcardio/pcsc_md.c                                           |     7 +-
 src/solaris/native/sun/security/smartcardio/pcsc_md.h                                           |    40 +
 src/solaris/native/sun/xawt/awt_Desktop.c                                                       |   108 +-
 src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java                              |    31 +-
 src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java                              |     8 +-
 src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java                              |     4 +-
 src/windows/classes/sun/awt/windows/WMenuItemPeer.java                                          |    10 +-
 src/windows/classes/sun/awt/windows/WObjectPeer.java                                            |     8 +-
 src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java                      |    11 +-
 src/windows/classes/sun/nio/fs/WindowsConstants.java                                            |     1 +
 src/windows/classes/sun/nio/fs/WindowsFileStore.java                                            |    18 +-
 src/windows/classes/sun/nio/fs/WindowsLinkSupport.java                                          |     2 +-
 src/windows/native/java/lang/java_props_md.c                                                    |   126 +-
 src/windows/native/java/net/AbstractPlainDatagramSocketImpl.c                                   |   111 -
 src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c                                  |    50 +-
 src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c                                  |    43 +-
 src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp                                  |     8 +-
 src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h                                    |     3 +-
 src/windows/native/sun/security/krb5/NativeCreds.c                                              |     5 +-
 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                                                |    49 +-
 src/windows/native/sun/windows/awt_Component.h                                                  |     6 +-
 src/windows/native/sun/windows/awt_Menu.cpp                                                     |   147 +-
 src/windows/native/sun/windows/awt_Menu.h                                                       |    16 +-
 src/windows/native/sun/windows/awt_MenuBar.cpp                                                  |    81 +-
 src/windows/native/sun/windows/awt_MenuBar.h                                                    |    12 +-
 src/windows/native/sun/windows/awt_MenuItem.cpp                                                 |   303 +-
 src/windows/native/sun/windows/awt_MenuItem.h                                                   |    15 +-
 src/windows/native/sun/windows/awt_PopupMenu.cpp                                                |    15 +-
 src/windows/native/sun/windows/awt_PopupMenu.h                                                  |     2 +-
 src/windows/native/sun/windows/awt_new.cpp                                                      |     3 +
 src/windows/resource/java.manifest                                                              |     2 +
 test/ProblemList.txt                                                                            |     3 +
 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/crypto/provider/Cipher/UTIL/TestUtil.java                                          |    13 +-
 test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java                                 |    16 +-
 test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java                                   |   111 +-
 test/com/sun/jdi/AllLineLocations.java                                                          |     1 -
 test/com/sun/jdi/ClassesByName.java                                                             |     1 -
 test/com/sun/jdi/ExceptionEvents.java                                                           |     1 -
 test/com/sun/jdi/FilterMatch.java                                                               |     1 -
 test/com/sun/jdi/FilterNoMatch.java                                                             |     1 -
 test/com/sun/jdi/GetUninitializedStringValue.java                                               |    91 +
 test/com/sun/jdi/LaunchCommandLine.java                                                         |     1 -
 test/com/sun/jdi/ModificationWatchpoints.java                                                   |     1 -
 test/com/sun/jdi/NativeInstanceFilter.java                                                      |     1 -
 test/com/sun/jdi/NullThreadGroupNameTest.java                                                   |   112 +
 test/com/sun/jdi/UnpreparedByName.java                                                          |     1 -
 test/com/sun/jdi/UnpreparedClasses.java                                                         |     1 -
 test/com/sun/jdi/Vars.java                                                                      |     1 -
 test/com/sun/jdi/oom/@debuggeeVMOptions                                                         |     1 +
 test/com/sun/jdi/oom/OomDebugTest.java                                                          |   417 +
 test/com/sun/jdi/oom/OomDebugTestSetup.sh                                                       |    46 +
 test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java                                    |   104 +
 test/com/sun/jndi/ldap/LdapURLOptionalFields.java                                               |    62 +
 test/com/sun/security/sasl/ntlm/NTLMTest.java                                                   |    78 +-
 test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java                                |     9 +
 test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.html                   |    32 +
 test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java                   |   266 +
 test/java/awt/Focus/8073453/AWTFocusTransitionTest.java                                         |   115 +
 test/java/awt/Focus/8073453/SwingFocusTransitionTest.java                                       |   131 +
 test/java/awt/Frame/ObscuredFrame/ObscuredFrameTest.java                                        |    71 +
 test/java/awt/MouseInfo/GetPointerInfoTest.java                                                 |    73 +
 test/java/awt/MouseInfo/MultiscreenPointerInfo.java                                             |    90 +
 test/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java                      |    89 +
 test/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java                   |    65 +
 test/java/awt/ScrollPane/bug8077409Test.java                                                    |   115 +
 test/java/awt/TextArea/TextAreaTwicePack/TextAreaTwicePack.java                                 |    66 +
 test/java/awt/Window/8027025/Test8027025.java                                                   |    77 +
 test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java                                   |    86 +
 test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java                 |    66 +
 test/java/awt/image/MultiResolutionImageTest.java                                               |   620 +
 test/java/lang/Math/Tests.java                                                                  |    36 +-
 test/java/lang/Math/WorstCaseTests.java                                                         |   435 +
 test/java/lang/reflect/Proxy/ProxyRace.java                                                     |    91 +
 test/java/net/InetAddress/getOriginalHostName.java                                              |    71 +
 test/java/net/MulticastSocket/MultiDead.java                                                    |   134 +
 test/java/net/URL/TestHttps.java                                                                |    34 +
 test/java/nio/MappedByteBuffer/Basic.java                                                       |    91 +-
 test/java/nio/channels/FileChannel/LoopingTruncate.java                                         |    84 +
 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/probeContentType/ParallelProbes.java                                   |    96 +
 test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java           |     9 +-
 test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java                   |     9 +-
 test/java/text/Format/DateFormat/Bug8081794.java                                                |    51 +
 test/java/util/Currency/CurrencyTest.java                                                       |    40 +-
 test/java/util/Currency/PropertiesTest.java                                                     |    12 +-
 test/java/util/Currency/PropertiesTest.sh                                                       |    24 +-
 test/java/util/Currency/ValidateISO4217.java                                                    |     3 +-
 test/java/util/Currency/currency.properties                                                     |    17 +-
 test/java/util/Currency/tablea1.txt                                                             |     5 +-
 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/zip/ZipFile/MultiThreadedReadTest.java                                           |    92 +
 test/java/util/zip/ZipFile/ZipEntryFreeTest.java                                                |   130 +
 test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java                                         |   379 +
 test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java                                   |   182 +
 test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java                                     |    52 +
 test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java                         |    65 +
 test/javax/swing/JMenu/8071705/bug8071705.java                                                  |   207 +
 test/javax/swing/JMenuItem/8031573/bug8031573.html                                              |    40 +
 test/javax/swing/JMenuItem/8031573/bug8031573.java                                              |    60 +
 test/javax/swing/JOptionPane/8024926/bug8024926.html                                            |    32 +
 test/javax/swing/JOptionPane/8024926/bug8024926.java                                            |   209 +
 test/javax/swing/JPopupMenu/7154841/bug7154841.java                                             |   121 +
 test/javax/swing/JRadioButton/8075609/bug8075609.java                                           |   115 +
 test/javax/xml/jaxp/testng/parse/jdk7156085/UTF8ReaderBug.java                                  |    64 +
 test/javax/xml/jaxp/transform/8167179/NamespacePrefixTest.java                                  |   188 +
 test/jdk/internal/misc/Unsafe/CopySwap.java                                                     |   723 +
 test/lib/testlibrary/jdk/testlibrary/Utils.java                                                 |    27 +
 test/sun/awt/image/bug8038000.java                                                              |     4 +-
 test/sun/java2d/cmm/ColorConvertOp/AlphaTest.java                                               |    99 +
 test/sun/java2d/cmm/ColorConvertOp/GrayTest.java                                                |   102 +
 test/sun/java2d/cmm/ProfileOp/DisposalCrashTest.java                                            |    83 +
 test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java                                         |    34 +-
 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.java                                               |   170 +-
 test/sun/misc/URLClassPath/ClassnameCharTest.sh                                                 |    60 -
 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/protocol/file/DirPermissionDenied.sh                                           |     1 +
 test/sun/net/www/protocol/http/HttpInputStream.java                                             |   136 +-
 test/sun/security/krb5/ConfPlusProp.java                                                        |    33 +-
 test/sun/security/krb5/DnsFallback.java                                                         |    48 +-
 test/sun/security/krb5/auto/SSL.java                                                            |     6 +-
 test/sun/security/krb5/config/DNS.java                                                          |    12 +-
 test/sun/security/krb5/confplusprop.conf                                                        |     2 +-
 test/sun/security/krb5/confplusprop2.conf                                                       |     2 +-
 test/sun/security/krb5/runNameEquals.sh                                                         |    20 +-
 test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java                                          |    30 +-
 test/sun/security/pkcs11/PKCS11Test.java                                                        |   217 +-
 test/sun/security/pkcs11/README                                                                 |    22 +
 test/sun/security/pkcs11/SecmodTest.java                                                        |     1 +
 test/sun/security/pkcs11/ec/ReadCertificates.java                                               |    16 +-
 test/sun/security/pkcs11/ec/TestCurves.java                                                     |    33 +-
 test/sun/security/pkcs11/ec/TestECDH.java                                                       |     8 +-
 test/sun/security/pkcs11/ec/TestECDH2.java                                                      |     9 +-
 test/sun/security/pkcs11/ec/TestECDSA.java                                                      |    21 +-
 test/sun/security/pkcs11/ec/TestECDSA2.java                                                     |     9 +-
 test/sun/security/pkcs11/ec/TestECGenSpec.java                                                  |    19 +-
 test/sun/security/pkcs11/ec/TestKeyFactory.java                                                 |    14 +-
 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/DSA/TestDSA2.java                                                    |     2 +-
 test/sun/security/ssl/ServerHandshaker/HelloExtensionsTest.java                                 |   287 +
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java       |     8 +-
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java              |     2 +-
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java               |   135 +-
 test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java                          |     5 +-
 test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java                       |     6 +
 test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java                            |     3 +
 test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java                             |     6 +-
 test/sun/security/tools/jarsigner/TimestampCheck.java                                           |     6 +-
 test/tools/launcher/RunpathTest.java                                                            |    84 +
 test/tools/pack200/MemoryAllocatorTest.java                                                     |   369 +
 863 files changed, 52638 insertions(+), 49523 deletions(-)

diffs (truncated from 123533 to 500 lines):

diff -r 8108ffe38ccb -r 45e35cd6fd73 .hgtags
--- a/.hgtags	Tue Feb 07 01:26:26 2017 +0000
+++ b/.hgtags	Thu Jul 27 16:57:30 2017 +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
 3dbb06a924cdf73d39b8543824ec88ae501ba5c6 jdk7u45-b35
@@ -414,8 +427,11 @@
 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
@@ -425,7 +441,11 @@
 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-b17
@@ -553,8 +573,20 @@
 09f3004e9b123b457da8f314aec027a5f4c3977f jdk7u76-b31
 efc8886310cbccb941f826acfad2ad51a2891be5 jdk7u80-b00
 bc7f9d966c1df3748ef9c148eab25976cd065963 jdk7u80-b01
+0cc91db3a787da44e3775bdde4c3c222d3cd529f icedtea-2.6pre07
+21eee0ed9be97d4e283cdf626971281481e711f1 icedtea-2.6pre06
+9702c7936ed8da9befdc27d30b2cbf51718d810a icedtea-2.6pre08
 2590a9c18fdba19086712bb91a28352e9239a2be jdk7u80-b02
+1ceeb31e72caa1b458194f7ae776cf4ec29731e7 icedtea-2.6pre09
+33a33bbea1ae3a7feef5f3216e85c56b708444f4 icedtea-2.6pre10
+8a445d1b5af50e8628b8b1367f734d4e5741d12a icedtea-2.6pre11
 3796111298d5b013e46d5ce49f17c16fc3197be8 jdk7u80-b03
+3620a98d0295f2b5ba4483483e61bfc386e734c1 icedtea-2.6pre12
+13bd267f397d41749dcd08576a80f368cf3aaad7 icedtea-2.6pre13
+ccdc37cdfaa891e3c14174378a8e7a5871e8893b icedtea-2.6pre14
+6dd583aadca80b71e8c004d9f4f3deb1d779ccfb icedtea-2.6pre15
+2e8f3cd07f149eab799f60db51ff3629f6ab0664 icedtea-2.6pre16
+3ce28e98738c7f9bb238378a991d4708598058a2 icedtea-2.6pre17
 54acd5cd04856e80a3c7d5d38ef9c7a44d1e215a jdk7u80-b04
 45f30f5524d4eef7aa512e35d5399cc4d84af174 jdk7u79-b00
 2879572fbbb7be4d44e2bcd815711590cc6538e9 jdk7u79-b01
@@ -572,6 +604,11 @@
 da34e5f77e9e922844e7eb8d1e165d25245a8b40 jdk7u79-b30
 ea77b684d424c40f983d1aff2c9f4ef6a9c572b0 jdk7u79-b15
 d4bd8bd71ca7233c806357bd39514dcaeebaa0ee jdk7u80-b05
+19a30444897fca52d823d63f6e2fbbfac74e8b34 icedtea-2.6pre18
+29fdd3e4a4321604f113df9573b9d4d215cf1b1d icedtea-2.6pre19
+95e2e973f2708306632792991502a86907a8e2ca icedtea-2.6pre20
+533e9029af3503d09a95b70abb4c21ca3fc9ac89 icedtea-2.6pre21
+d17bcae64927f33e6e7e0e6132c62a7bf523dbc3 icedtea-2.6pre22
 f33e6ea5f4832468dd86a8d48ef50479ce91111e jdk7u80-b06
 feb04280659bf05b567dc725ff53e2a2077bdbb7 jdk7u80-b07
 f1334857fa99e6472870986b6071f9405c29ced4 jdk7u80-b08
@@ -584,9 +621,19 @@
 75fb0553cc146fb238df4e93dbe90791435e84f9 jdk7u80-b30
 daa5092b07a75c17356bb438adba03f83f94ef17 jdk7u80-b15
 a942e0b5247772ea326705c717c5cd0ad1572aaa jdk7u80-b32
-a4521bae269393be804805432429c3f996239c1a jdk7u85-b00
-47954a92adb039f893e4732017213d8488b22a58 jdk7u85-b01
+ec336c81a5455ef96a20cff4716603e7f6ca01ad icedtea-2.6pre23
+444d55ffed65907640aad374ce84e7a01ba8dbe7 icedtea-2.6pre24
+2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6.0
+ec192fcd997198899cc376b0afad2c53893dedad jdk7u85-b00
+fc2855d592b09fe16d0d47a24d09466f776dcb54 jdk7u85-b01
+2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6-branchpoint
+15db078b2bfde69f953bcf7a69273aff495a4701 icedtea-2.7.0pre01
+6a8bf2d8048964b384b20c71bf441f113193a81b icedtea-2.7.0pre02
 66eea0d727761bfbee10784baa6941f118bc06d1 jdk7u85-b02
+dbb972937b50ccd7edc4534d74b91eb66fe6cf0b icedtea-2.7.0pre03
+91216176dcc70528412a937e962bcc7221322701 icedtea-2.7.0pre04
+3fc5cbcd46dd9ac3c7a8eae4758e067eb701d129 icedtea-2.7.0pre05
+d35404fe959028c7238a63d611d6278a1de0a216 icedtea-2.7.0pre06
 295856e8680fa7248dac54bc15b3d6ef697b27ce jdk7u91-b00
 9fc5d7338840ef6b73d28290735bab11395824b0 jdk7u91-b01
 c434c67b8189677dec0a0034a109fb261497cd92 jdk7u91-b02
@@ -595,5 +642,13 @@
 bdcfc4d9ab9f52fbf37db876c08a1846765627c4 jdk7u101-b00
 a7267e8244b9418af15b1103b4d906e8c6a61bc0 jdk7u111-b00
 cc1ed9a351886645eb729144696e41d187564ec2 jdk7u111-b01
+5e3d7e2b2a002891085b3483d204bdd9f85af395 icedtea-2.7.0pre07
+15b47679f447bb41684452a043c230e334222329 icedtea-2.7.0pre08
+2f95b16f0065477e54b1601b5da0907812176446 icedtea-2.7.0pre09
 c16fb4099a2bafe701d533d9a0fd869e7f8e5408 jdk7u121-b00
 86d0df91308912e45e1b00f8699e0b157a8857af jdk7u131-b00
+d6392d3c3e8dedd968c8301d2dfa4dc98c39e353 icedtea-2.7.0pre10
+e14bbf59343de7bfbc5927499983d34ce588ac79 icedtea-2.7.0pre11
+e890a6aef6223d428376aac846c1d1f3e40dbda7 jdk7u141-b00
+a319566e15f5611bae9cfda2696e8217020a9269 jdk7u141-b01
+5af12d99fb1ea4642305058adb1f3f771d8b5eff icedtea-2.7.0pre12
diff -r 8108ffe38ccb -r 45e35cd6fd73 .jcheck/conf
--- a/.jcheck/conf	Tue Feb 07 01:26:26 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/com/sun/java/pack/Makefile	Thu Jul 27 16:57:30 2017 +0100
@@ -76,7 +76,7 @@
   OTHER_CXXFLAGS += $(ZINCLUDE)
   LDDFLAGS += $(ZIPOBJS)
  else
-  LDDFLAGS += $(ZLIB_LIBS)
+  OTHER_LDLIBS += $(ZLIB_LIBS)
   OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
  endif
 else
@@ -100,8 +100,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")
@@ -158,7 +157,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 8108ffe38ccb -r 45e35cd6fd73 make/com/sun/nio/Makefile
--- a/make/com/sun/nio/Makefile	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/com/sun/nio/Makefile	Thu Jul 27 16:57:30 2017 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2010, 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
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/com/sun/nio/sctp/Makefile	Thu Jul 27 16:57:30 2017 +0100
@@ -29,7 +29,7 @@
 
 BUILDDIR = ../../../..
 PACKAGE = com.sun.nio.sctp
-LIBRARY = sctp
+LIBRARY = javasctp
 PRODUCT = sun
 #OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint
 include $(BUILDDIR)/common/Defs.gmk
@@ -67,10 +67,16 @@
   -I$(PLATFORM_SRC)/native/java/net \
   -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
 
+ifeq ($(SYSTEM_SCTP), true)
+  OTHER_INCLUDES += $(SCTP_CFLAGS)
+endif
+
 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
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread
 endif
 ifeq ($(PLATFORM), solaris)
 #LIBSCTP = -lsctp
@@ -79,6 +85,13 @@
 endif # macosx
 endif # windows
 
+ifeq ($(SYSTEM_SCTP), true)
+  OTHER_LDLIBS += $(SCTP_LIBS)
+  OTHER_CFLAGS += -DUSE_SYSTEM_SCTP
+else
+  OTHER_LDLIBS += -ldl
+endif
+
 clean clobber::
 	$(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp
 	$(RM) -r $(CLASSDESTDIR)/sun/nio/ch
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/com/sun/security/auth/module/Makefile
--- a/make/com/sun/security/auth/module/Makefile	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/com/sun/security/auth/module/Makefile	Thu Jul 27 16:57:30 2017 +0100
@@ -78,7 +78,3 @@
 #
 include $(BUILDDIR)/common/Library.gmk
 
-#
-# JVMDI implementation lives in the VM.
-#
-OTHER_LDLIBS = $(JVMLIB)
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/common/Defs-embedded.gmk
--- a/make/common/Defs-embedded.gmk	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/common/Defs-embedded.gmk	Thu Jul 27 16:57:30 2017 +0100
@@ -64,7 +64,9 @@
 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
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/common/Defs-linux.gmk	Thu Jul 27 16:57:30 2017 +0100
@@ -188,32 +188,54 @@
 #    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_m68k    +=
+CFLAGS_REQUIRED_mips    +=
+CFLAGS_REQUIRED_mipsel  += -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_ppc     += -m32 -fsigned-char -D_BIG_ENDIAN
+CFLAGS_REQUIRED_ppc64   += -m64 -D_BIG_ENDIAN
+LDFLAGS_COMMON_ppc64    += -m64 -L/lib64 -Wl,-melf64ppc
+CFLAGS_REQUIRED_ppc64le += -D_LITTLE_ENDIAN -DABI_ELFv2
+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
-CFLAGS_REQUIRED_arm     += -fsigned-char -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_ppc     += -fsigned-char -D_BIG_ENDIAN
-ifeq ($(ARCH),ppc64)
-  ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
-    CFLAGS_REQUIRED_ppc64   += -m64 -D_BIG_ENDIAN
-    LDFLAGS_COMMON_ppc64    += -m64 -L/lib64 -Wl,-melf64ppc
-  else ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),little)
-    CFLAGS_REQUIRED_ppc64   += -D_LITTLE_ENDIAN -DABI_ELFv2
-  else
-    $(error Expected big/little for ARCH=ppc64, got OPENJDK_TARGET_CPU_ENDIAN=$(OPENJDK_TARGET_CPU_ENDIAN))
-  endif
-endif
 ifeq ($(ZERO_BUILD), true)
   CFLAGS_REQUIRED       =  $(ZERO_ARCHFLAG)
   ifeq ($(ZERO_ENDIANNESS), little)
     CFLAGS_REQUIRED     += -D_LITTLE_ENDIAN
   endif
   LDFLAGS_COMMON        += $(ZERO_ARCHFLAG)
+  ifeq ($(ZERO_ARCHDEF),PPC) 
+# gcc bug http://gcc.gnu.org/PR63341 in ppc code generation requires -fno-tree-vectorize for now
+    ifeq ($(ARCH_DATA_MODEL), 32)
+      CFLAGS_REQUIRED   += -DPPC -DPPC32 -fno-tree-vectorize
+    else
+      CFLAGS_REQUIRED   += -DPPC -DPPC64 -fno-tree-vectorize
+    endif
+  else
+    ifeq ($(ZERO_ARCHDEF),PPC32)
+      CFLAGS_REQUIRED   += -DPPC -DPPC32 -fno-tree-vectorize
+    else
+      ifeq  ($(ZERO_ARCHDEF),PPC64)
+        CFLAGS_REQUIRED   += -DPPC -DPPC64 -fno-tree-vectorize
+      endif
+    endif
+  endif
 else
+# gcc bug http://gcc.gnu.org/PR63341 in ppc code generation requires -fno-tree-vectorize for now
+CFLAGS_REQUIRED_ppc     += -fno-tree-vectorize
+CFLAGS_REQUIRED_ppc64   += -fno-tree-vectorize
+#
   CFLAGS_REQUIRED       =  $(CFLAGS_REQUIRED_$(ARCH))
   LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
 endif
@@ -249,9 +271,7 @@
 #
 # Misc compiler options
 #
-ifneq ($(ARCH),ppc)
-  CFLAGS_COMMON   = -fno-strict-aliasing
-endif 
+CFLAGS_COMMON   = -fno-strict-aliasing
 PIC_CODE_LARGE = -fPIC
 PIC_CODE_SMALL = -fpic
 GLOBAL_KPIC = $(PIC_CODE_LARGE)
@@ -302,11 +322,15 @@
 
 CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
 
-# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
-ifneq ($(ARCH),alpha)
+# Alpha and sh archs do not like "alpha" or "sh" defined (potential general arch cleanup issue here)
+ifeq ($(ARCH),alpha)
+  CPP_ARCH_FLAGS += -D_$(ARCH)_
+else
+ifeq ($(ARCH),sh)
+  CPP_ARCH_FLAGS += -D_$(ARCH)_
+else
   CPP_ARCH_FLAGS += -D$(ARCH)
-else
-  CPP_ARCH_FLAGS += -D_$(ARCH)_
+endif
 endif
 
 CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \
@@ -347,8 +371,13 @@
 
   LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
 
+ifneq ($(INSTALL_LOCATION),)
+  LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)
+  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/:$(INSTALL_LOCATION)/jre/lib/$(LIBARCH)%)
+else
   LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
   LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
+endif
 
 endif
 
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/common/Defs-macosx.gmk
--- a/make/common/Defs-macosx.gmk	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/common/Defs-macosx.gmk	Thu Jul 27 16:57:30 2017 +0100
@@ -407,4 +407,9 @@
 OTHER_CXXFLAGS += -D_DARWIN_UNLIMITED_SELECT
 OTHER_CPPFLAGS += -D_DARWIN_UNLIMITED_SELECT
 
+# Use unlimited select
+OTHER_CFLAGS += -D_DARWIN_UNLIMITED_SELECT
+OTHER_CXXFLAGS += -D_DARWIN_UNLIMITED_SELECT
+OTHER_CPPFLAGS += -D_DARWIN_UNLIMITED_SELECT
+
 LIB_LOCATION ?= $(LIBDIR)
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/common/Defs.gmk
--- a/make/common/Defs.gmk	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/common/Defs.gmk	Thu Jul 27 16:57:30 2017 +0100
@@ -234,14 +234,30 @@
 JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
 
 #
-# All libraries except libjava and libjvm itself link against libjvm and
-# libjava, the latter for its exported common utilities.  libjava only links
-# against libjvm.  Programs' makefiles take their own responsibility for
+# For now, most libraries except libjava and libjvm itself link against libjvm
+# and libjava, the latter for its exported common utilities. libjava only
+# links against libjvm. Programs' makefiles take their own responsibility for
 # adding other libs.
 #
+# The makefiles for these packages do not link against libjvm and libjava.
+# This list will eventually go away and each Programs' makefiles
+# will have to explicitly declare that they want to link to libjava/libjvm
+#
+NO_JAVALIB_PKGS = \
+		sun.security.mscapi \
+		sun.security.krb5 \
+		sun.security.pkcs11 \
+		sun.security.jgss \
+		sun.security.jgss.wrapper \
+		sun.security.ec \
+		sun.security.smartcardio \
+		com.sun.security.auth.module
+
 ifdef PACKAGE
 # put JAVALIB first, but do not lose any platform specific values....
-  LDLIBS_COMMON = $(JAVALIB)
+  ifeq (,$(findstring $(PACKAGE),$(NO_JAVALIB_PKGS)))
+    LDLIBS_COMMON = $(JAVALIB)
+  endif
 endif # PACKAGE
 
 #
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/common/Demo.gmk
--- a/make/common/Demo.gmk	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/common/Demo.gmk	Thu Jul 27 16:57:30 2017 +0100
@@ -27,7 +27,7 @@
   
 # Some names are defined with LIBRARY inside the Defs.gmk file
 LIBRARY=$(DEMONAME)
-OBJDIR=$(TEMPDIR)/$(DEMONAME)
+OBJDIR=$(TEMPDIR)/$(DEMONAME)/$(OBJDIRNAME)
 
 # Input:
 #    DEMONAME           - name of the demo
diff -r 8108ffe38ccb -r 45e35cd6fd73 make/common/Library.gmk
--- a/make/common/Library.gmk	Tue Feb 07 01:26:26 2017 +0000
+++ b/make/common/Library.gmk	Thu Jul 27 16:57:30 2017 +0100
@@ -180,7 +180,7 @@
 	$(LINK) -dll -out:$(OBJDIR)/$(@F) \
 	  $(MAP_OPTION) \
 	  $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
-	  $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
+	  $(OTHER_LCF) $(LDLIBS)
 	$(CP) $(OBJDIR)/$(@F) $@
 	@$(call binary_file_verification,$@)
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
@@ -269,6 +269,7 @@
   ifneq ($(PLATFORM), macosx)
     ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
       ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
+      ifneq ($(STRIP_POLICY),no_strip)
         ifeq ($(PLATFORM), solaris)
 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
 # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
@@ -279,19 +280,20 @@
 #
 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
 # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.


More information about the distro-pkg-dev mailing list