/hg/release/icedtea7-forest-2.3/jdk: 22 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Aug 10 05:28:55 PDT 2012


changeset 6173fdbaf945 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=6173fdbaf945
author: cl
date: Fri Jul 27 16:14:57 2012 -0700

	Added tag jdk7u6-b21 for changeset 243717d7fe95


changeset 05c69338ee73 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=05c69338ee73
author: rupashka
date: Thu Jul 12 14:47:13 2012 +0400

	7169111: Unreadable menu bar with Ambiance theme in GTK L&F
	Reviewed-by: kizune


changeset a51e0bc5a081 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=a51e0bc5a081
author: anthony
date: Thu Jul 12 20:00:21 2012 +0400

	7162144: Missing AWT thread in headless mode in 7u4 b06
	Summary: invokeAndWait() will throw InterruptedException when the EDT.interrupt() is called
	Reviewed-by: serb, bagiras


changeset c399756623cb in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=c399756623cb
author: weijun
date: Mon Jul 16 11:56:45 2012 +0800

	7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
	Reviewed-by: xuelei, vinnie


changeset 3aa687530ca9 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=3aa687530ca9
author: vinnie
date: Mon Jul 16 16:31:10 2012 +0100

	7182500: OCSP revocation checking fails if OCSP responce does not contain certificates
	Reviewed-by: xuelei, valeriep


changeset ba7fae92732e in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=ba7fae92732e
author: leonidr
date: Tue Jul 17 01:59:14 2012 +0400

	7181027: [macosx] Unable to use headless mode
	Reviewed-by: anthony


changeset 122ea6020d26 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=122ea6020d26
author: skoppar
date: Fri Jul 13 08:18:50 2012 -0700

	7182135: Impossible to use some editors directly
	Reviewed-by: asaha, vikram


changeset 5e92a5e288f2 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5e92a5e288f2
author: serb
date: Thu Jul 19 14:54:59 2012 +0400

	7170657: [macosx] There seems to be no keyboard/mouse action to select non-contiguous items in List
	Reviewed-by: rupashka


changeset fc870376e780 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=fc870376e780
author: kizune
date: Thu Jul 19 20:11:20 2012 +0400

	7177144: [macosx] Drag and drop not working (regression in 7u6)
	Reviewed-by: art, bagiras


changeset cbb4a165d660 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=cbb4a165d660
author: michaelm
date: Thu Jul 19 19:30:34 2012 +0100

	7183292: HttpURLConnection.getHeaderFields() throws IllegalArgumentException: Illegal cookie name
	Reviewed-by: chegar, khazra


changeset 1318ba62cd1e in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1318ba62cd1e
author: lana
date: Thu Jul 19 20:19:35 2012 -0700

	Merge


changeset bf5bf37108c1 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bf5bf37108c1
author: alexsch
date: Fri Jul 20 13:58:52 2012 +0400

	7182902: [macosx] Test api/java_awt/GraphicsDevice/indexTGF.html#SetDisplayMode fails on Mac OS X 10.7
	Reviewed-by: bae, kizune


changeset 84d5cdbe7bce in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=84d5cdbe7bce
author: prr
date: Fri Jul 20 10:17:33 2012 -0700

	7183251: Netbeans editor renders text wrong on JDK 7u6 build
	Reviewed-by: igor, jgodinez


changeset bf941141d1bf in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=bf941141d1bf
author: serb
date: Fri Jul 20 23:53:10 2012 +0400

	7184401: JDk7u6 : Missing main menu bar in Netbeans after fix for 7162144
	Reviewed-by: prr, art


changeset 348fea6059d2 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=348fea6059d2
author: denis
date: Mon Jul 23 21:52:27 2012 +0400

	7184845: Apps6: menu tree bean in form throws npe in jre 7 while closing
	Reviewed-by: anthony, serb


changeset 038b17edbb4b in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=038b17edbb4b
author: kizune
date: Tue Jul 24 12:43:40 2012 +0400

	7184951: [macosx] Exception at java.awt.datatransfer on headless mode (only in GUI session)
	Reviewed-by: art, serb


changeset f2738a05273d in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=f2738a05273d
author: alexsch
date: Tue Jul 24 12:52:33 2012 +0400

	7185512: The printout doesn't match image on screen.
	Reviewed-by: serb, bagiras


changeset e47e40956e1b in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=e47e40956e1b
author: sherman
date: Wed Jul 25 14:00:55 2012 -0700

	7184145: (pack200) pack200 --repack throws NullPointerException when JAR file specified without path
	Summary: fixed the null case
	Reviewed-by: alanb


changeset d78f2b600d39 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=d78f2b600d39
author: lana
date: Mon Jul 30 14:24:41 2012 -0700

	Merge


changeset 0ae89e53f530 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=0ae89e53f530
author: katleman
date: Wed Aug 01 19:33:29 2012 -0700

	Added tag jdk7u6-b22 for changeset d78f2b600d39


changeset 1c775da99873 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=1c775da99873
author: katleman
date: Tue Aug 07 12:10:45 2012 -0700

	Added tag jdk7u6-b23 for changeset 0ae89e53f530


changeset 5b5011312422 in /hg/release/icedtea7-forest-2.3/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk?cmd=changeset;node=5b5011312422
author: andrew
date: Thu Aug 09 22:20:09 2012 +0100

	Merge jdk7u6-b23


diffstat:

 .hgtags                                                                                         |    10 +
 make/com/sun/java/pack/Makefile                                                                 |    22 +-
 make/common/Defs-linux.gmk                                                                      |    23 +-
 make/common/Program.gmk                                                                         |    10 +-
 make/common/Release.gmk                                                                         |    20 +-
 make/common/shared/Compiler-gcc.gmk                                                             |    76 +-
 make/common/shared/Defs-java.gmk                                                                |    20 +-
 make/common/shared/Defs-versions.gmk                                                            |     2 +-
 make/common/shared/Defs.gmk                                                                     |     2 +-
 make/common/shared/Platform.gmk                                                                 |     9 +
 make/common/shared/Sanity.gmk                                                                   |     8 +
 make/docs/Makefile                                                                              |     6 +-
 make/java/jli/Makefile                                                                          |    38 +-
 make/java/net/FILES_c.gmk                                                                       |     7 +
 make/java/net/Makefile                                                                          |    26 +-
 make/java/nio/Makefile                                                                          |   218 +-
 make/java/version/Makefile                                                                      |     5 +
 make/java/zip/FILES_c.gmk                                                                       |     2 +-
 make/java/zip/Makefile                                                                          |     6 +-
 make/javax/crypto/Makefile                                                                      |     3 +-
 make/javax/sound/SoundDefs.gmk                                                                  |    48 +
 make/jdk_generic_profile.sh                                                                     |    81 +-
 make/sun/awt/FILES_c_unix.gmk                                                                   |    10 +
 make/sun/awt/Makefile                                                                           |     2 +-
 make/sun/awt/mawt.gmk                                                                           |    39 +-
 make/sun/cmm/lcms/FILES_c_unix.gmk                                                              |     7 +-
 make/sun/cmm/lcms/Makefile                                                                      |     8 +-
 make/sun/font/Makefile                                                                          |     6 +-
 make/sun/jpeg/FILES_c.gmk                                                                       |     6 +-
 make/sun/jpeg/Makefile                                                                          |    11 +-
 make/sun/net/FILES_java.gmk                                                                     |     1 +
 make/sun/security/pkcs11/mapfile-vers                                                           |     6 +-
 make/sun/splashscreen/FILES_c.gmk                                                               |    78 +-
 make/sun/splashscreen/Makefile                                                                  |    42 +-
 make/sun/xawt/FILES_c_unix.gmk                                                                  |    20 +
 make/sun/xawt/Makefile                                                                          |    62 +-
 make/tools/Makefile                                                                             |     2 +
 make/tools/freetypecheck/Makefile                                                               |     2 +-
 make/tools/generate_nimbus/Makefile                                                             |     1 +
 make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java                                   |    22 +-
 make/tools/src/build/tools/compileproperties/CompileProperties.java                             |     9 +-
 make/tools/src/build/tools/dirdiff/DirDiff.java                                                 |     4 +-
 make/tools/src/build/tools/dtdbuilder/DTDBuilder.java                                           |    34 +-
 make/tools/src/build/tools/dtdbuilder/DTDInputStream.java                                       |     6 +-
 make/tools/src/build/tools/dtdbuilder/DTDParser.java                                            |    44 +-
 make/tools/src/build/tools/dtdbuilder/PublicMapping.java                                        |     6 +-
 make/tools/src/build/tools/generatebreakiteratordata/CharSet.java                               |    16 +-
 make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java   |     8 +-
 make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java             |     6 +-
 make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java         |   201 +-
 make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java            |     6 +-
 make/tools/src/build/tools/generatecharacter/GenerateCharacter.java                             |     4 +-
 make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java                                |   147 +-
 make/tools/src/build/tools/generatecharacter/UnicodeSpec.java                                   |    22 +-
 make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java                       |     4 +-
 make/tools/src/build/tools/hasher/Hasher.java                                                   |    38 +-
 make/tools/src/build/tools/jarsplit/JarSplit.java                                               |     5 +-
 make/tools/src/build/tools/javazic/Gen.java                                                     |    14 +-
 make/tools/src/build/tools/javazic/GenDoc.java                                                  |    16 +-
 make/tools/src/build/tools/javazic/Main.java                                                    |     3 +-
 make/tools/src/build/tools/javazic/Simple.java                                                  |    23 +-
 make/tools/src/build/tools/javazic/Time.java                                                    |    10 +-
 make/tools/src/build/tools/javazic/Zoneinfo.java                                                |    18 +-
 make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java                                     |     7 +-
 make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java                                       |     7 +-
 make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java                                       |    14 +-
 make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java                                    |    26 +-
 make/tools/src/build/tools/jdwpgen/AltNode.java                                                 |     4 +-
 make/tools/src/build/tools/jdwpgen/CommandSetNode.java                                          |    11 +-
 make/tools/src/build/tools/jdwpgen/ConstantSetNode.java                                         |     9 +-
 make/tools/src/build/tools/jdwpgen/ErrorSetNode.java                                            |     9 +-
 make/tools/src/build/tools/jdwpgen/Node.java                                                    |    25 +-
 make/tools/src/build/tools/jdwpgen/OutNode.java                                                 |    14 +-
 make/tools/src/build/tools/jdwpgen/RootNode.java                                                |    10 +-
 make/tools/src/build/tools/jdwpgen/SelectNode.java                                              |    10 +-
 make/tools/src/build/tools/makeclasslist/MakeClasslist.java                                     |    15 +-
 make/tools/src/build/tools/stripproperties/StripProperties.java                                 |     4 +-
 src/macosx/classes/sun/awt/CGraphicsDevice.java                                                 |    15 +-
 src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java                                        |     4 +
 src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java                           |     9 +-
 src/macosx/native/sun/awt/CGraphicsDevice.m                                                     |    12 +-
 src/share/bin/java.c                                                                            |     8 +-
 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/GTKLookAndFeel.java                               |     3 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java                                     |     5 +-
 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java                              |     6 +
 src/share/classes/com/sun/java/util/jar/pack/Attribute.java                                     |    14 +-
 src/share/classes/com/sun/java/util/jar/pack/BandStructure.java                                 |     6 +-
 src/share/classes/com/sun/java/util/jar/pack/ClassReader.java                                   |    12 +-
 src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java                                   |     8 +-
 src/share/classes/com/sun/java/util/jar/pack/Code.java                                          |     4 +-
 src/share/classes/com/sun/java/util/jar/pack/Coding.java                                        |     7 +-
 src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java                                  |    34 +-
 src/share/classes/com/sun/java/util/jar/pack/Constants.java                                     |    12 +-
 src/share/classes/com/sun/java/util/jar/pack/Driver.java                                        |    12 +-
 src/share/classes/com/sun/java/util/jar/pack/Fixups.java                                        |    41 +-
 src/share/classes/com/sun/java/util/jar/pack/Instruction.java                                   |     4 +-
 src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java                                  |     2 +-
 src/share/classes/com/sun/java/util/jar/pack/Package.java                                       |    58 +-
 src/share/classes/com/sun/java/util/jar/pack/PackageReader.java                                 |    29 +-
 src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java                                 |    38 +-
 src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java                                    |    11 +-
 src/share/classes/com/sun/java/util/jar/pack/PropMap.java                                       |    61 +-
 src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java                                     |     4 +-
 src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java                                  |     3 +-
 src/share/classes/com/sun/java/util/jar/pack/Utils.java                                         |     4 +-
 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/script/javascript/RhinoScriptEngine.java                              |     6 +-
 src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java                       |     8 +-
 src/share/classes/com/sun/script/javascript/RhinoTopLevel.java                                  |     3 +-
 src/share/classes/java/awt/EventQueue.java                                                      |    10 +
 src/share/classes/java/awt/GraphicsEnvironment.java                                             |     6 +-
 src/share/classes/java/awt/color/ICC_Profile.java                                               |     4 +-
 src/share/classes/java/io/InputStream.java                                                      |     2 +-
 src/share/classes/java/net/HttpCookie.java                                                      |    28 +-
 src/share/classes/java/net/SocksSocketImpl.java                                                 |     4 +-
 src/share/classes/java/security/Policy.java                                                     |     1 -
 src/share/classes/javax/crypto/Cipher.java                                                      |   172 +-
 src/share/classes/javax/crypto/JarVerifier.java                                                 |   157 -
 src/share/classes/javax/crypto/JceSecurity.java                                                 |   251 +-
 src/share/classes/javax/crypto/JceSecurityManager.java                                          |   252 -
 src/share/classes/javax/swing/JComponent.java                                                   |    13 +-
 src/share/classes/javax/swing/JDialog.java                                                      |     3 +-
 src/share/classes/javax/swing/JEditorPane.java                                                  |    11 +-
 src/share/classes/javax/swing/JFrame.java                                                       |    10 +-
 src/share/classes/javax/swing/JInternalFrame.java                                               |     6 +-
 src/share/classes/javax/swing/JPopupMenu.java                                                   |    10 +-
 src/share/classes/javax/swing/MenuSelectionManager.java                                         |     5 +-
 src/share/classes/javax/swing/PopupFactory.java                                                 |    14 +-
 src/share/classes/javax/swing/SwingUtilities.java                                               |    15 +-
 src/share/classes/javax/swing/SwingWorker.java                                                  |     2 +-
 src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java                                   |     6 +-
 src/share/classes/javax/swing/plaf/basic/BasicListUI.java                                       |     5 +-
 src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java                                  |    16 +-
 src/share/classes/javax/swing/plaf/basic/BasicTableUI.java                                      |    10 +-
 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/plaf/synth/SynthMenuUI.java                                       |     3 +-
 src/share/classes/javax/swing/text/JTextComponent.java                                          |     6 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java                     |     2 -
 src/share/classes/sun/applet/AppletPanel.java                                                   |    10 +-
 src/share/classes/sun/applet/AppletViewerPanel.java                                             |    18 +-
 src/share/classes/sun/awt/image/JPEGImageDecoder.java                                           |     2 +-
 src/share/classes/sun/beans/editors/BoolEditor.java                                             |    31 +
 src/share/classes/sun/beans/editors/IntEditor.java                                              |    31 +
 src/share/classes/sun/font/SunLayoutEngine.java                                                 |     5 +-
 src/share/classes/sun/java2d/cmm/lcms/LCMS.java                                                 |     2 +-
 src/share/classes/sun/misc/SharedSecrets.java                                                   |     7 +-
 src/share/classes/sun/misc/Version.java.template                                                |    58 +-
 src/share/classes/sun/rmi/registry/RegistryImpl.java                                            |    14 +
 src/share/classes/sun/rmi/server/LoaderHandler.java                                             |     2 +-
 src/share/classes/sun/rmi/server/UnicastServerRef.java                                          |     2 +-
 src/share/classes/sun/security/pkcs/SignerInfo.java                                             |    23 +-
 src/share/classes/sun/security/pkcs11/P11Digest.java                                            |   185 +-
 src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java                                       |   377 +-
 src/share/classes/sun/security/provider/certpath/OCSP.java                                      |    18 +-
 src/share/classes/sun/security/provider/certpath/OCSPResponse.java                              |     4 +-
 src/share/classes/sun/security/ssl/SSLEngineImpl.java                                           |    11 +
 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/Main.java                                                       |     2 +-
 src/share/classes/sun/tools/native2ascii/Main.java                                              |     9 +-
 src/share/classes/sun/util/calendar/ZoneInfoFile.java                                           |    41 +-
 src/share/demo/jvmti/gctest/sample.makefile.txt                                                 |     6 +-
 src/share/demo/jvmti/heapTracker/sample.makefile.txt                                            |    19 +-
 src/share/demo/jvmti/heapViewer/sample.makefile.txt                                             |     5 +-
 src/share/demo/jvmti/hprof/sample.makefile.txt                                                  |     6 +-
 src/share/demo/jvmti/minst/sample.makefile.txt                                                  |    19 +-
 src/share/demo/jvmti/mtrace/sample.makefile.txt                                                 |    20 +-
 src/share/demo/jvmti/versionCheck/sample.makefile.txt                                           |     6 +-
 src/share/demo/jvmti/waiters/sample.makefile.txt                                                |     8 +-
 src/share/lib/security/java.security                                                            |    14 +-
 src/share/lib/security/sunpkcs11-solaris.cfg                                                    |    14 +-
 src/share/native/com/sun/java/util/jar/pack/defines.h                                           |    14 +-
 src/share/native/com/sun/java/util/jar/pack/unpack.cpp                                          |     1 -
 src/share/native/com/sun/media/sound/SoundDefs.h                                                |     8 +
 src/share/native/java/util/zip/Adler32.c                                                        |     2 +-
 src/share/native/java/util/zip/CRC32.c                                                          |     2 +-
 src/share/native/java/util/zip/Deflater.c                                                       |    48 +-
 src/share/native/java/util/zip/Inflater.c                                                       |     8 +-
 src/share/native/java/util/zip/zip_util.c                                                       |     2 +-
 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                                               |     2 +-
 src/share/native/sun/awt/image/jpeg/jcapimin.c                                                  |   284 -
 src/share/native/sun/awt/image/jpeg/jcapistd.c                                                  |   165 -
 src/share/native/sun/awt/image/jpeg/jccoefct.c                                                  |   453 --
 src/share/native/sun/awt/image/jpeg/jccolor.c                                                   |   462 --
 src/share/native/sun/awt/image/jpeg/jcdctmgr.c                                                  |   391 --
 src/share/native/sun/awt/image/jpeg/jchuff.c                                                    |   913 -----
 src/share/native/sun/awt/image/jpeg/jchuff.h                                                    |    51 -
 src/share/native/sun/awt/image/jpeg/jcinit.c                                                    |    76 -
 src/share/native/sun/awt/image/jpeg/jcmainct.c                                                  |   297 -
 src/share/native/sun/awt/image/jpeg/jcmarker.c                                                  |   682 ---
 src/share/native/sun/awt/image/jpeg/jcmaster.c                                                  |   594 ---
 src/share/native/sun/awt/image/jpeg/jcomapi.c                                                   |   110 -
 src/share/native/sun/awt/image/jpeg/jconfig.h                                                   |    43 -
 src/share/native/sun/awt/image/jpeg/jcparam.c                                                   |   614 ---
 src/share/native/sun/awt/image/jpeg/jcphuff.c                                                   |   837 ----
 src/share/native/sun/awt/image/jpeg/jcprepct.c                                                  |   358 --
 src/share/native/sun/awt/image/jpeg/jcsample.c                                                  |   523 ---
 src/share/native/sun/awt/image/jpeg/jctrans.c                                                   |   392 --
 src/share/native/sun/awt/image/jpeg/jdapimin.c                                                  |   399 --
 src/share/native/sun/awt/image/jpeg/jdapistd.c                                                  |   279 -
 src/share/native/sun/awt/image/jpeg/jdcoefct.c                                                  |   740 ----
 src/share/native/sun/awt/image/jpeg/jdcolor.c                                                   |   398 --
 src/share/native/sun/awt/image/jpeg/jdct.h                                                      |   180 -
 src/share/native/sun/awt/image/jpeg/jddctmgr.c                                                  |   273 -
 src/share/native/sun/awt/image/jpeg/jdhuff.c                                                    |   655 ---
 src/share/native/sun/awt/image/jpeg/jdhuff.h                                                    |   205 -
 src/share/native/sun/awt/image/jpeg/jdinput.c                                                   |   385 --
 src/share/native/sun/awt/image/jpeg/jdmainct.c                                                  |   516 --
 src/share/native/sun/awt/image/jpeg/jdmarker.c                                                  |  1384 --------
 src/share/native/sun/awt/image/jpeg/jdmaster.c                                                  |   561 ---
 src/share/native/sun/awt/image/jpeg/jdmerge.c                                                   |   404 --
 src/share/native/sun/awt/image/jpeg/jdphuff.c                                                   |   672 ---
 src/share/native/sun/awt/image/jpeg/jdpostct.c                                                  |   294 -
 src/share/native/sun/awt/image/jpeg/jdsample.c                                                  |   482 --
 src/share/native/sun/awt/image/jpeg/jdtrans.c                                                   |   147 -
 src/share/native/sun/awt/image/jpeg/jerror.c                                                    |   272 -
 src/share/native/sun/awt/image/jpeg/jerror.h                                                    |   295 -
 src/share/native/sun/awt/image/jpeg/jfdctflt.c                                                  |   172 -
 src/share/native/sun/awt/image/jpeg/jfdctfst.c                                                  |   228 -
 src/share/native/sun/awt/image/jpeg/jfdctint.c                                                  |   287 -
 src/share/native/sun/awt/image/jpeg/jidctflt.c                                                  |   246 -
 src/share/native/sun/awt/image/jpeg/jidctfst.c                                                  |   372 --
 src/share/native/sun/awt/image/jpeg/jidctint.c                                                  |   393 --
 src/share/native/sun/awt/image/jpeg/jidctred.c                                                  |   402 --
 src/share/native/sun/awt/image/jpeg/jinclude.h                                                  |    95 -
 src/share/native/sun/awt/image/jpeg/jmemmgr.c                                                   |  1124 ------
 src/share/native/sun/awt/image/jpeg/jmemnobs.c                                                  |   113 -
 src/share/native/sun/awt/image/jpeg/jmemsys.h                                                   |   202 -
 src/share/native/sun/awt/image/jpeg/jmorecfg.h                                                  |   378 --
 src/share/native/sun/awt/image/jpeg/jpeg-6b/README                                              |   385 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapimin.c                                          |   284 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcapistd.c                                          |   165 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jccoefct.c                                          |   453 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jccolor.c                                           |   462 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcdctmgr.c                                          |   391 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.c                                            |   913 +++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jchuff.h                                            |    51 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcinit.c                                            |    76 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmainct.c                                          |   297 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmarker.c                                          |   682 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcmaster.c                                          |   594 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcomapi.c                                           |   110 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jconfig.h                                           |    43 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcparam.c                                           |   614 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcphuff.c                                           |   837 ++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcprepct.c                                          |   358 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jcsample.c                                          |   523 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jctrans.c                                           |   392 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapimin.c                                          |   399 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdapistd.c                                          |   279 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcoefct.c                                          |   740 ++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdcolor.c                                           |   398 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdct.h                                              |   180 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jddctmgr.c                                          |   273 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.c                                            |   655 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdhuff.h                                            |   205 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdinput.c                                           |   385 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmainct.c                                          |   516 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmarker.c                                          |  1384 ++++++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmaster.c                                          |   561 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdmerge.c                                           |   404 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdphuff.c                                           |   672 +++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdpostct.c                                          |   294 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdsample.c                                          |   482 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jdtrans.c                                           |   147 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.c                                            |   272 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jerror.h                                            |   295 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctflt.c                                          |   172 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctfst.c                                          |   228 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jfdctint.c                                          |   287 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctflt.c                                          |   246 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctfst.c                                          |   372 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctint.c                                          |   393 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jidctred.c                                          |   402 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jinclude.h                                          |    95 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemmgr.c                                           |  1124 ++++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemnobs.c                                          |   113 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmemsys.h                                           |   202 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jmorecfg.h                                          |   378 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jpegint.h                                           |   396 ++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jpeglib.h                                           |  1100 ++++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant1.c                                           |   860 ++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jquant2.c                                           |  1314 +++++++
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jutils.c                                            |   183 +
 src/share/native/sun/awt/image/jpeg/jpeg-6b/jversion.h                                          |    18 +
 src/share/native/sun/awt/image/jpeg/jpegdecoder.c                                               |     2 +-
 src/share/native/sun/awt/image/jpeg/jpegint.h                                                   |   396 --
 src/share/native/sun/awt/image/jpeg/jpeglib.h                                                   |  1100 ------
 src/share/native/sun/awt/image/jpeg/jquant1.c                                                   |   860 ----
 src/share/native/sun/awt/image/jpeg/jquant2.c                                                   |  1314 -------
 src/share/native/sun/awt/image/jpeg/jutils.c                                                    |   183 -
 src/share/native/sun/awt/image/jpeg/jversion.h                                                  |    18 -
 src/share/native/sun/awt/splashscreen/splashscreen_gif.c                                        |     2 +-
 src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c                                       |     7 +-
 src/share/native/sun/awt/splashscreen/splashscreen_png.c                                        |     2 +-
 src/share/native/sun/java2d/loops/TransformHelper.c                                             |    11 +-
 src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h                                    |     6 +-
 src/solaris/classes/sun/awt/X11/XWM.java                                                        |    10 +-
 src/solaris/classes/sun/awt/X11/XWindowPeer.java                                                |     2 +
 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                                      |   188 +
 src/solaris/native/common/deps/fontconfig2/fontconfig_fp.h                                      |   164 +
 src/solaris/native/common/deps/gconf2/gconf/gconf-client.h                                      |    42 +
 src/solaris/native/common/deps/gconf2/gconf_fp.c                                                |    74 +
 src/solaris/native/common/deps/gconf2/gconf_fp.h                                                |    48 +
 src/solaris/native/common/deps/glib2/gio/gio_typedefs.h                                         |    67 +
 src/solaris/native/common/deps/glib2/gio_fp.c                                                   |   109 +
 src/solaris/native/common/deps/glib2/gio_fp.h                                                   |    63 +
 src/solaris/native/common/deps/gtk2/gtk/gtk.h                                                   |   567 +++
 src/solaris/native/common/deps/gtk2/gtk_fp.c                                                    |   398 ++
 src/solaris/native/common/deps/gtk2/gtk_fp.h                                                    |   469 ++
 src/solaris/native/common/deps/syscalls_fp.c                                                    |   138 +
 src/solaris/native/common/deps/syscalls_fp.h                                                    |   124 +
 src/solaris/native/java/lang/java_props_md.c                                                    |    11 +-
 src/solaris/native/sun/awt/CUPSfuncs.c                                                          |   137 +-
 src/solaris/native/sun/awt/awt_GraphicsEnv.c                                                    |     2 +-
 src/solaris/native/sun/awt/awt_UNIXToolkit.c                                                    |    20 +-
 src/solaris/native/sun/awt/fontconfig.h                                                         |   941 -----
 src/solaris/native/sun/awt/fontpath.c                                                           |   404 +-
 src/solaris/native/sun/awt/gtk2_interface.c                                                     |   979 +----
 src/solaris/native/sun/awt/gtk2_interface.h                                                     |   577 +---
 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                                           |   465 +-
 src/solaris/native/sun/nio/ch/EPollArrayWrapper.c                                               |    62 +-
 src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c                                           |    94 +-
 src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c                                           |    50 +-
 src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c                                            |   111 +-
 src/solaris/native/sun/xawt/awt_Desktop.c                                                       |   103 +-
 src/windows/classes/sun/awt/windows/WComponentPeer.java                                         |     6 +-
 src/windows/native/sun/windows/awt_TextArea.cpp                                                 |    37 +-
 src/windows/native/sun/windows/awt_TextComponent.cpp                                            |    44 +
 src/windows/native/sun/windows/awt_TextComponent.h                                              |     1 +
 test/TEST.ROOT                                                                                  |     6 +
 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/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java                                |     9 +
 test/java/net/HttpCookie/IllegalCookieNameTest.java                                             |    74 +
 test/java/net/URL/TestHttps.java                                                                |    34 +
 test/java/nio/MappedByteBuffer/Basic.java                                                       |    91 +-
 test/java/nio/channels/SocketChannel/LocalAddress.java                                          |     2 +-
 test/java/nio/channels/TestUtil.java                                                            |     6 +-
 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/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java           |     9 +-
 test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java                   |     9 +-
 test/java/util/Locale/data/deflocale.sol10                                                      |  1725 ----------
 test/javax/swing/SwingUtilities/7170657/bug7170657.java                                         |    78 +
 test/sun/management/jmxremote/bootstrap/linux-i586/launcher                                     |   Bin 
 test/sun/management/jmxremote/bootstrap/solaris-i586/launcher                                   |   Bin 
 test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher                                  |   Bin 
 test/sun/management/windows/revokeall.exe                                                       |   Bin 
 test/sun/net/InetAddress/nameservice/dns/cname.sh                                               |     2 +-
 test/sun/net/www/protocol/file/DirPermissionDenied.sh                                           |     1 +
 test/sun/security/pkcs11/MessageDigest/TestCloning.java                                         |   141 +
 test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java                      |     2 +-
 test/sun/security/x509/AlgorithmId/NonStandardNames.java                                        |    84 +
 test/sun/tools/native2ascii/NativeErrors.java                                                   |     4 +-
 test/tools/pack200/MemoryAllocatorTest.java                                                     |   369 ++
 test/tools/pack200/RepackTest.java                                                              |    74 +
 376 files changed, 31194 insertions(+), 31603 deletions(-)

diffs (truncated from 71854 to 500 lines):

diff -r 243717d7fe95 -r 5b5011312422 .hgtags
--- a/.hgtags	Wed Jul 18 16:11:18 2012 -0700
+++ b/.hgtags	Thu Aug 09 22:20:09 2012 +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
@@ -191,6 +197,10 @@
 e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
 966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
 aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint
 4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
 a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
 09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
+243717d7fe9589148951ffb5551264af0e446314 jdk7u6-b21
+d78f2b600d393f45d6ace8ca0f29ad677624a775 jdk7u6-b22
+0ae89e53f5300da1961984a7d81c220c7cf717d7 jdk7u6-b23
diff -r 243717d7fe95 -r 5b5011312422 make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/com/sun/java/pack/Makefile	Thu Aug 09 22:20:09 2012 +0100
@@ -32,6 +32,7 @@
 LIBRARY = unpack
 PRODUCT = sun
 PGRM = unpack200
+JAVAC_MAX_WARNINGS=true
 include $(BUILDDIR)/common/Defs.gmk
 
 CPLUSPLUSLIBRARY=true
@@ -57,7 +58,6 @@
 vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
 
 ifeq ($(STANDALONE),true)
- ifneq ($(SYSTEM_ZLIB),true)
   ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
 
   ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
@@ -71,13 +71,14 @@
 	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
 
-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-  OTHER_CXXFLAGS += $(ZINCLUDE)
-  LDDFLAGS += $(ZIPOBJS)
- else
-  LDDFLAGS += -lz
-  OTHER_CXXFLAGS += -DSYSTEM_ZLIB
- endif
+  ifdef USE_SYSTEM_ZLIB
+    OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DUSE_SYSTEM_ZLIB=1
+    OTHER_LDLIBS += $(ZLIB_LIBS)
+  else
+    ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+    OTHER_CXXFLAGS += $(ZINCLUDE)
+    LDDFLAGS += $(ZIPOBJS)
+  endif
 else
   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
   OTHER_LDLIBS += $(JVMLIB)
@@ -99,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")
@@ -157,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 243717d7fe95 -r 5b5011312422 make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/Defs-linux.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -191,15 +191,26 @@
 #    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_alpha   += -mieee -D_LITTLE_ENDIAN
 CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+CFLAGS_REQUIRED_arm     += -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
+CFLAGS_REQUIRED_ppc64   += -m64
+CFLAGS_REQUIRED_s390    +=
+CFLAGS_REQUIRED_s390x   += -m64
 CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
 LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
 CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
 LDFLAGS_COMMON_sparc    += -m32 -mcpu=v9
 CFLAGS_REQUIRED_arm     += -fsigned-char -D_LITTLE_ENDIAN
 CFLAGS_REQUIRED_ppc     += -fsigned-char -D_BIG_ENDIAN
+CFLAGS_REQUIRED_sh      += -mieee
 ifeq ($(ZERO_BUILD), true)
   CFLAGS_REQUIRED       =  $(ZERO_ARCHFLAG)
   ifeq ($(ZERO_ENDIANNESS), little)
@@ -289,11 +300,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) \
diff -r 243717d7fe95 -r 5b5011312422 make/common/Program.gmk
--- a/make/common/Program.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/Program.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -62,12 +62,14 @@
 program: $(ACTUAL_PROGRAM)
 
 # Work-around for missing processor specific mapfiles
+ifneq (,$(filter $(ARCH), amd64 i586 sparc sparcv9))
 ifndef CROSS_COMPILE_ARCH
   # reuse the mapfiles in the launcher's directory, the same should
   # be applicable to the tool launchers as well.
   FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH)
   include $(BUILDDIR)/common/Mapfile-vers.gmk
 endif
+endif
 
 include $(JDK_TOPDIR)/make/common/Rules.gmk
 
@@ -108,6 +110,9 @@
     endif # ARCH_DATA_MODEL
   endif # PLATFORM SOLARIS
   ifeq ($(PLATFORM), linux)
+    ifdef USE_SYSTEM_ZLIB
+      OTHER_LDLIBS += $(ZLIB_LIBS)
+    endif
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
@@ -358,13 +363,16 @@
 endif
 
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
+
 ifeq ($(PLATFORM), macosx)
   OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
   ifneq ($(SYSTEM_ZLIB), true)
     OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
   endif # SYSTEM_ZLIB
 else # PLATFORM !MACOSX
-  OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+  ifndef USE_SYSTEM_ZLIB
+    OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+  endif
 endif
 
 OTHER_CPPFLAGS  += -DPROGNAME='"$(PROGRAM)"'
diff -r 243717d7fe95 -r 5b5011312422 make/common/Release.gmk
--- a/make/common/Release.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/Release.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -1074,13 +1074,9 @@
 	for d in $(SOURCE_DIRS); do \
 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
 	  ($(CD) $$d &&  \
-	    for sd in $(SOURCES) ; do \
-              if [ -d $$sd ] ; then \
-	        $(FIND) $$sd $(SOURCE_FILES_filter) \
-		        -name '*.java' -print \
-		        >> $(ABS_TEMPDIR)/src-files.list ; \
-	      fi; \
-	    done ; \
+	    $(FIND) . $(SOURCE_FILES_filter) \
+	    -name '*.java' -print \
+	    >> $(ABS_TEMPDIR)/src-files.list ; \
 	  ) ; \
 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
 	    ($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \
@@ -1091,13 +1087,9 @@
 	for d in $(SOURCE_DIRS); do \
 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
 	  ($(CD) $$d && \
-	    for sd in $(SOURCES) ; do \
-              if [ -d $$sd ] ; then \
-	        $(FIND) $$sd $(SOURCE_FILES_filter) \
-		        -name '*.java' -print \
-		        >> $(ABS_TEMPDIR)/src-files.list ; \
-	      fi; \
-	    done ; \
+	    $(FIND) . $(SOURCE_FILES_filter) \
+	    -name '*.java' -print \
+	    >> $(ABS_TEMPDIR)/src-files.list ; \
 	  ) ; \
 	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
 	    ($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \
diff -r 243717d7fe95 -r 5b5011312422 make/common/shared/Compiler-gcc.gmk
--- a/make/common/shared/Compiler-gcc.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/shared/Compiler-gcc.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -53,18 +53,84 @@
 
 ifeq ($(PLATFORM), linux)
 
+  ifndef BUILD_GCC
+    BUILD_GCC=$(COMPILER_PATH)gcc
+  endif
+
+  ifndef BUILD_CPP
+    BUILD_CPP=$(COMPILER_PATH)g++
+  endif
+
   # Settings specific to Linux
-  CC             = $(COMPILER_PATH)gcc
-  CPP            = $(COMPILER_PATH)gcc -E
+  CC             = $(BUILD_GCC)
+  CPP            = $(BUILD_GCC) -E
   # statically link libstdc++ before C++ ABI is stablized on Linux
-  STATIC_CXX     = true
+  ifneq ($(STATIC_CXX),false)
+    STATIC_CXX     = true
+  endif
   ifeq ($(STATIC_CXX),true)
     # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
     # We need to use gcc to statically link the C++ runtime. gcc and g++ use
     # the same subprocess to compile C++ files, so it is OK to build using gcc.
-    CXX            = $(COMPILER_PATH)gcc
+    CXX            = $(BUILD_GCC)
   else
-    CXX            = $(COMPILER_PATH)g++
+    CXX            = $(BUILD_CPP)
+  endif
+  ifeq ($(ARCH), alpha)
+    # alpha
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifeq ($(ARCH), amd64)
+    # amd64
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifeq ($(ARCH), arm)
+    # arm
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifeq ($(ARCH), i586)
+    # i586
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.1*
+    REQUIRED_GCC_VER_INT = 3.2.1-7a
+  endif
+  ifeq ($(ARCH), ia64)
+    # ia64
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 2.9[56789].*
+  endif
+  ifneq ("$(findstring m68k,$(ARCH))", "")
+    # m68k
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifneq ("$(findstring mips,$(ARCH))", "")
+    # mips
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifneq ("$(findstring parisc,$(ARCH))", "")
+    # mips
+    REQUIRED_CC_VER = 4.4
+    REQUIRED_GCC_VER = 4.4.*
+  endif
+  ifneq ("$(findstring ppc,$(ARCH))", "")
+    # ppc or ppc64
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifneq ("$(findstring s390,$(ARCH))", "")
+    # s390 or s390x
+    REQUIRED_CC_VER = 3.2
+    REQUIRED_GCC_VER = 3.2.*
+  endif
+  ifneq ("$(findstring sh,$(ARCH))", "")
+    # sh4*, sh3*
+    REQUIRED_CC_VER = 4.0
+    REQUIRED_GCC_VER = 4.0.*
   endif
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -shared
diff -r 243717d7fe95 -r 5b5011312422 make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/shared/Defs-java.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -121,12 +121,17 @@
   JAVACFLAGS += -g
 endif
 ifeq ($(JAVAC_MAX_WARNINGS), true)
-  JAVACFLAGS  += -Xlint:all
+  JAVAC_LINT_OPTIONS += -Xlint:all
 endif
 ifeq ($(JAVAC_WARNINGS_FATAL), true)
   JAVACFLAGS  += -Werror
 endif
 
+# TODO: Workaround for CR 7063027. Remove -path eventually.
+JAVAC_LINT_OPTIONS += -Xlint:-path
+
+JAVACFLAGS += $(JAVAC_LINT_OPTIONS)
+
 #
 # Some licensees do not get the Security Source bundles.  We will
 # fall back on the prebuilt jce.jar so that we can do a best
@@ -216,9 +221,7 @@
 # The javac options supplied to the boot javac is limited. This compiler
 #   should only be used to build the 'make/tools' sources, which are not
 #   class files that end up in the classes directory.
-ifeq ($(JAVAC_MAX_WARNINGS), true)
-  BOOT_JAVACFLAGS  += -Xlint:all
-endif
+BOOT_JAVACFLAGS += $(JAVAC_LINT_OPTIONS)
 ifeq ($(JAVAC_WARNINGS_FATAL), true)
   BOOT_JAVACFLAGS  += -Werror
 endif
@@ -230,9 +233,16 @@
 
 BOOT_JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
 
+BOOT_LIB = $(BOOTDIR)/jre/lib/rt.jar
+BOOT_JAVACFLAGS += -bootclasspath $(BOOT_LIB)
+
 BOOT_JAVA_CMD      = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
 BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
-BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
+ifdef ALT_JAR_CMD
+  BOOT_JAR_CMD       = $(ALT_JAR_CMD)
+else
+  BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
+endif
 BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
 
 # Various tools we need to run (FIXUP: Are these the right ones?)
diff -r 243717d7fe95 -r 5b5011312422 make/common/shared/Defs-versions.gmk
--- a/make/common/shared/Defs-versions.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/shared/Defs-versions.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -208,7 +208,7 @@
 # Generic
 REQUIRED_ANT_VER          = 1.7.1
 REQUIRED_BOOT_VER         = 1.6
-REQUIRED_FREETYPE_VERSION = 2.3.0
+REQUIRED_FREETYPE_VERSION = 2.2.1
 REQUIRED_MAKE_VER         = 3.81
 REQUIRED_UNZIP_VER        = 5.12
 REQUIRED_ZIP_VER          = 2.2
diff -r 243717d7fe95 -r 5b5011312422 make/common/shared/Defs.gmk
--- a/make/common/shared/Defs.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/shared/Defs.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -223,7 +223,7 @@
 
 # Default names
 ifdef OPENJDK
-  LAUNCHER_NAME = openjdk
+  LAUNCHER_NAME = java
   PRODUCT_NAME = OpenJDK
   PRODUCT_SUFFIX = Runtime Environment
   JDK_RC_PLATFORM_NAME = Platform
diff -r 243717d7fe95 -r 5b5011312422 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/shared/Platform.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -160,6 +160,9 @@
   else
     mach := $(shell uname -m)
   endif
+  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
+  endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \
                     echo i586 \
@@ -176,6 +179,9 @@
                 arm*) \
                     echo arm \
                     ;; \
+                sh*) \
+                    echo sh \
+                    ;; \
                 *) \
                     echo $(mach) \
                     ;; \
@@ -205,6 +211,9 @@
       ifeq ($(ARCH), ia64)
         ARCH_DATA_MODEL=64
       endif
+      ifeq ($(ARCH), sh)
+        ARCH_DATA_MODEL=32
+      endif
     endif
   endif
 
diff -r 243717d7fe95 -r 5b5011312422 make/common/shared/Sanity.gmk
--- a/make/common/shared/Sanity.gmk	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/common/shared/Sanity.gmk	Thu Aug 09 22:20:09 2012 +0100
@@ -95,6 +95,10 @@
       echo "RedHat"; \
     elif [ -f /etc/SuSE-release ] ; then \
       echo "SuSE"; \
+    elif [ -f /etc/gentoo-release ] ; then \
+      echo "Gentoo"; \
+    elif [ -f /etc/debian_version ] ; then \
+      echo "Debian"; \
     elif [ -f /etc/lsb-release ] ; then \
       $(EGREP) DISTRIB_ID /etc/lsb-release | $(SED) -e 's at .*DISTRIB_ID=\(.*\)@\1@'; \
     else \
@@ -103,6 +107,10 @@
   OS_VARIANT_VERSION := $(shell \
     if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
       $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
+    elif [ "$(OS_VARIANT_NAME)" = "Gentoo" ] ; then \
+      $(CAT) /etc/gentoo-release | $(HEAD) -1 | $(NAWK) '{ print $$5; }' ; \
+    elif [ "$(OS_VARIANT_NAME)" = "Debian" ] ; then \
+      $(CAT) /etc/debian_version ; \
     elif [ -f /etc/lsb-release ] ; then \
       $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's at .*DISTRIB_RELEASE=\(.*\)@\1@'; \
     fi)
diff -r 243717d7fe95 -r 5b5011312422 make/docs/Makefile
--- a/make/docs/Makefile	Wed Jul 18 16:11:18 2012 -0700
+++ b/make/docs/Makefile	Thu Aug 09 22:20:09 2012 +0100
@@ -69,11 +69,11 @@
 #    NOTE: javadoc will not complete without these larger settings.
 #    WARNING: This could cause thrashing on low memory machines.
 ifeq ($(ARCH_DATA_MODEL),64)
-  MAX_VM_MEMORY = 1024
+  MAX_VM_MEMORY = 1536
 else ifeq ($(ARCH),universal)
-  MAX_VM_MEMORY = 1024
+  MAX_VM_MEMORY = 1536
 else
-  MAX_VM_MEMORY = 512
+  MAX_VM_MEMORY = 768
 endif
 
 # List of all possible directories for javadoc to look for sources
diff -r 243717d7fe95 -r 5b5011312422 make/java/jli/Makefile



More information about the distro-pkg-dev mailing list