/hg/release/icedtea7-forest-2.4/jdk: 14 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 4 10:23:45 PDT 2013
changeset ae85cfff71e9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ae85cfff71e9
author: asaha
date: Mon Aug 19 12:19:01 2013 -0700
Added tag jdk7u40-b40 for changeset 42b57fb81c39
changeset b479996d5c92 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b479996d5c92
author: katleman
date: Wed Aug 21 12:11:37 2013 -0700
Added tag jdk7u40-b41 for changeset ae85cfff71e9
changeset fb25cdef17e9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fb25cdef17e9
author: katleman
date: Mon Aug 26 07:41:45 2013 -0700
Added tag jdk7u40-b42 for changeset b479996d5c92
changeset ed444a09a5fd in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ed444a09a5fd
author: katleman
date: Tue Aug 27 08:43:09 2013 -0700
Added tag jdk7u40-b43 for changeset fb25cdef17e9
changeset 168bd87376ea in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=168bd87376ea
author: katleman
date: Tue Sep 03 22:34:40 2013 -0700
Added tag jdk7u40-b60 for changeset ed444a09a5fd
changeset 73dacb7e1e46 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=73dacb7e1e46
author: andrew
date: Wed Sep 04 16:45:43 2013 +0100
Merge jdk7u40-b60
changeset 8c32012ed998 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8c32012ed998
author: jgodinez
date: Wed Feb 06 14:45:02 2013 -0800
8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
Reviewed-by: prr, vadim
Contributed-by: jia-hong.chen at oracle.com
changeset e48d34b7f242 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e48d34b7f242
author: ebaron
date: Wed Aug 14 17:42:50 2013 +0100
Handle alternative Kerberos credential cache locations
changeset 5d4700b439fc in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5d4700b439fc
author: andrew
date: Fri Aug 30 01:00:23 2013 +0100
Fix Kerberos cache support to check for null, fallback on old path support and not hardcode the krb5 library.
changeset 4b7642bbc8d7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4b7642bbc8d7
author: andrew
date: Tue Sep 03 15:19:59 2013 +0100
Only define _GNU_SOURCE if not already defined.
changeset 560c783d93b3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=560c783d93b3
author: andrew
date: Wed Sep 04 17:28:03 2013 +0100
PR1551: Add build support for Zero AArch64
changeset 9c5337739f79 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9c5337739f79
author: andrew
date: Wed Sep 04 17:32:38 2013 +0100
PR1552: Add -D_LITTLE_ENDIAN for ARM architectures.
changeset abcc5e95d577 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=abcc5e95d577
author: andrew
date: Wed Sep 04 17:53:23 2013 +0100
PR1553: Add Debian AArch64 support
changeset b2611b1a750c in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=b2611b1a750c
author: andrew
date: Wed Sep 04 18:20:38 2013 +0100
PR1554: Fix build on Mac OS X
Contributed-by: Alex Kasko <alex.kasko.lists at gmail.com>
diffstat:
.hgtags | 15 +
.jcheck/conf | 2 -
make/com/sun/java/pack/Makefile | 7 +-
make/com/sun/nio/sctp/Makefile | 2 +
make/common/Defs-linux.gmk | 23 +-
make/common/Library.gmk | 40 +-
make/common/Program.gmk | 80 +-
make/common/Release.gmk | 20 +-
make/common/shared/Compiler-gcc.gmk | 76 +-
make/common/shared/Defs-java.gmk | 11 +-
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/net/FILES_c.gmk | 7 +
make/java/net/Makefile | 26 +-
make/java/nio/Makefile | 226 +-
make/java/security/Makefile | 12 +-
make/java/sun_nio/Makefile | 2 +-
make/java/version/Makefile | 5 +
make/javax/sound/SoundDefs.gmk | 52 +
make/jdk_generic_profile.sh | 89 +-
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/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/Makefile | 7 +-
make/sun/native2ascii/Makefile | 2 +-
make/sun/net/FILES_java.gmk | 1 +
make/sun/nio/cs/Makefile | 2 +-
make/sun/security/Makefile | 11 +-
make/sun/security/krb5/internal/ccache/Makefile | 49 +
make/sun/security/pkcs11/mapfile-vers | 4 +-
make/sun/splashscreen/FILES_c.gmk | 78 +-
make/sun/splashscreen/Makefile | 35 +-
make/sun/xawt/FILES_c_unix.gmk | 20 +
make/sun/xawt/Makefile | 62 +-
make/tools/Makefile | 9 +
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/share/bin/java.c | 8 +-
src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 6 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 2 +-
src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 2 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java | 5 +-
src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java | 2 +
src/share/classes/com/sun/jndi/dns/DnsContextFactory.java | 2 +-
src/share/classes/com/sun/naming/internal/ResourceManager.java | 42 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java | 2 +-
src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java | 8 +-
src/share/classes/com/sun/script/javascript/RhinoTopLevel.java | 3 +-
src/share/classes/java/awt/color/ICC_Profile.java | 4 +-
src/share/classes/java/io/InputStream.java | 2 +-
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/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 | 6 +-
src/share/classes/javax/swing/SwingWorker.java | 2 +-
src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java | 6 +-
src/share/classes/javax/swing/plaf/basic/BasicListUI.java | 5 +-
src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java | 16 +-
src/share/classes/javax/swing/plaf/basic/BasicTableUI.java | 8 +-
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java | 3 +-
src/share/classes/javax/swing/plaf/synth/ImagePainter.java | 5 +-
src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java | 3 +-
src/share/classes/javax/swing/text/JTextComponent.java | 6 +-
src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java | 2 -
src/share/classes/sun/applet/AppletPanel.java | 10 +-
src/share/classes/sun/applet/AppletViewerPanel.java | 18 +-
src/share/classes/sun/awt/image/JPEGImageDecoder.java | 2 +-
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/krb5/internal/ccache/FileCredentialsCache.java | 96 +-
src/share/classes/sun/security/pkcs11/Config.java | 3 +
src/share/classes/sun/security/pkcs11/P11Digest.java | 185 +-
src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 4 +-
src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +-
src/share/classes/sun/security/pkcs11/P11Util.java | 16 +-
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 23 +-
src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java | 377 +-
src/share/classes/sun/security/provider/certpath/OCSP.java | 18 +-
src/share/classes/sun/security/ssl/SSLEngineImpl.java | 11 +
src/share/classes/sun/security/util/KeyUtil.java | 21 +-
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-linux | 4 +
src/share/lib/security/java.security-macosx | 4 +
src/share/lib/security/java.security-solaris | 4 +
src/share/lib/security/java.security-windows | 4 +
src/share/lib/security/nss.cfg.in | 5 +
src/share/lib/security/sunpkcs11-solaris.cfg | 14 +-
src/share/native/com/sun/java/util/jar/pack/unpack.cpp | 1 -
src/share/native/com/sun/media/sound/SoundDefs.h | 9 +
src/share/native/java/util/zip/Deflater.c | 46 +-
src/share/native/java/util/zip/Inflater.c | 6 +-
src/share/native/sun/awt/image/awt_ImageRep.c | 2 +-
src/share/native/sun/awt/image/jpeg/README | 385 --
src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 7 +-
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 | 11 +-
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 7 +-
src/share/native/sun/awt/splashscreen/splashscreen_png.c | 2 +-
src/share/native/sun/font/freetypeScaler.c | 7 +-
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 | 161 +
src/solaris/native/common/deps/gconf2/gconf/gconf-client.h | 41 +
src/solaris/native/common/deps/gconf2/gconf_fp.c | 76 +
src/solaris/native/common/deps/gconf2/gconf_fp.h | 48 +
src/solaris/native/common/deps/glib2/gio/gio_typedefs.h | 65 +
src/solaris/native/common/deps/glib2/gio_fp.c | 109 +
src/solaris/native/common/deps/glib2/gio_fp.h | 61 +
src/solaris/native/common/deps/glib2/glib_fp.h | 41 +
src/solaris/native/common/deps/gtk2/gtk/gtk.h | 567 +++
src/solaris/native/common/deps/gtk2/gtk_fp.c | 398 ++
src/solaris/native/common/deps/gtk2/gtk_fp.h | 469 ++
src/solaris/native/common/deps/syscalls_fp.c | 122 +
src/solaris/native/common/deps/syscalls_fp.h | 79 +
src/solaris/native/java/lang/java_props_md.c | 7 +-
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 | 400 +-
src/solaris/native/sun/awt/gtk2_interface.c | 988 +----
src/solaris/native/sun/awt/gtk2_interface.h | 580 +---
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 | 1 -
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/security/krb5/internal/ccache/krb5ccache.c | 113 +
src/solaris/native/sun/xawt/awt_Desktop.c | 103 +-
test/Makefile | 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/com/sun/crypto/provider/TLS/TestLeadingZeroes.java | 420 ++
test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java | 9 +
test/java/net/URL/TestHttps.java | 34 +
test/java/nio/MappedByteBuffer/Basic.java | 91 +-
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/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/pkcs11/tls/TestLeadingZeroesP11.java | 410 ++
test/sun/tools/native2ascii/NativeErrors.java | 4 +-
test/tools/launcher/RunpathTest.java | 84 +
test/tools/pack200/MemoryAllocatorTest.java | 369 ++
352 files changed, 31827 insertions(+), 30675 deletions(-)
diffs (truncated from 70646 to 500 lines):
diff -r 42b57fb81c39 -r b2611b1a750c .hgtags
--- a/.hgtags Mon Aug 12 12:07:45 2013 -0700
+++ b/.hgtags Wed Sep 04 18:20:38 2013 +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,7 @@
e50c9a5f001c61f49e7e71b25b97ed4095d3557b jdk7u6-b15
966e21feb7f088e318a35b069c1a61ff6363e554 jdk7u6-b16
aa0ad405f70bc7a7af95fef109f114ceecf31232 jdk7u6-b17
+8ff5fca08814f1f0eeda40aaec6f2936076b7444 icedtea-2.3-branchpoint
4a6917092af80481c1fa5b9ec8ccae75411bb72c jdk7u6-b18
a263f787ced5bc7c14078ae552c82de6bd011611 jdk7u6-b19
09145b546a2b6ae1f44d5c8a7d2a37d48e4b39e2 jdk7u6-b20
@@ -258,6 +265,7 @@
cb81ee79a72d84f99b8e7d73b5ae73124b661fe7 jdk7u12-b07
b5e180ef18a0c823675bcd32edfbf2f5122d9722 jdk7u12-b08
2e7fe0208e9c928f2f539fecb6dc8a1401ecba9e jdk7u12-b09
+b171007921c3d01066848c88cbcb6a376df3f01c icedtea-2.4-branchpoint
e012aace90500a88f51ce83fcd27791f5dbf493f jdk7u14-b10
9eb82fb221f3b34a5df97e7db3c949fdb0b6fee0 jdk7u14-b11
ee3ab2ed2371dd72ad5a75ebb6b6b69071e29390 jdk7u14-b12
@@ -318,6 +326,7 @@
eb4807b899c84c92959b66f888f8cc8b028c7665 jdk7u14-b19
a249c45148c51dc53250c5d0c3d506ec5f9b88ab jdk7u14-b19
bb8764ec11c2c4ca318bcf6aabdabd29c70b2cd1 jdk7u14-b20
+d1563025e086a464f05414267b84a6408f7b377d icedtea-2.4.0
0a00f10abb2df203f13a723be158fb759e54b19b jdk7u14-b21
d4bf5c15837c47d179c71f6df8716ad9bef53ef9 jdk7u14-b22
a76a886dc057582bf332e60a023d8f8a35526217 jdk7u40-b23
@@ -328,6 +337,7 @@
2043900095890e676f5ed0f959f470e2138c2a9a jdk7u40-b28
d3186a0676dbc7ab80e00fa67f952b67933d5a35 jdk7u40-b29
60d52db33828bf0355a94be2a82df90c901592f3 jdk7u40-b30
+65d95818d79e340d042457ee1a8155d7658e86b6 icedtea-2.4.1
c2522d149ff6663ed1d3602c88c286cff25a43a7 jdk7u40-b31
b9f86896cd0aa9b83e472a90b20ae7c253fba633 jdk7u40-b32
419939ecee8311c8a38ff624ae67e473f8c60e51 jdk7u40-b33
@@ -337,3 +347,8 @@
04036faa7fc4ec11a268c190cf1712d19c77b4ba jdk7u40-b37
070b277e1b43cc4b6a4e1ae419d1273970f718ed jdk7u40-b38
33921df593eda3d241d0d1322effc21486a6bb94 jdk7u40-b39
+42b57fb81c3958fc98e7c5cd81826565f4cedb91 jdk7u40-b40
+ae85cfff71e95c3a1882177779c5f681d2621410 jdk7u40-b41
+b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42
+fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
+ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
diff -r 42b57fb81c39 -r b2611b1a750c .jcheck/conf
--- a/.jcheck/conf Mon Aug 12 12:07:45 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 42b57fb81c39 -r b2611b1a750c make/com/sun/java/pack/Makefile
--- a/make/com/sun/java/pack/Makefile Mon Aug 12 12:07:45 2013 -0700
+++ b/make/com/sun/java/pack/Makefile Wed Sep 04 18:20:38 2013 +0100
@@ -75,7 +75,7 @@
OTHER_CXXFLAGS += $(ZINCLUDE)
LDDFLAGS += $(ZIPOBJS)
else
- LDDFLAGS += $(ZLIB_LIBS)
+ OTHER_LDLIBS += $(ZLIB_LIBS)
OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB
endif
else
@@ -99,8 +99,7 @@
RES = $(OBJDIR)/$(PGRM).res
else
LDOUTPUT = -o #Have a space
- LDDFLAGS += -lc
- OTHER_LDLIBS += $(LIBCXX)
+ OTHER_LDLIBS += -lc $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
ifeq ("$(CC_VER_MAJOR)", "3")
@@ -157,7 +156,7 @@
$(prep-target)
$(RM) $(TEMPDIR)/mapfile-vers
$(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers
- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
ifdef MT
$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif
diff -r 42b57fb81c39 -r b2611b1a750c make/com/sun/nio/sctp/Makefile
--- a/make/com/sun/nio/sctp/Makefile Mon Aug 12 12:07:45 2013 -0700
+++ b/make/com/sun/nio/sctp/Makefile Wed Sep 04 18:20:38 2013 +0100
@@ -60,7 +60,9 @@
-I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
ifeq ($(PLATFORM), linux)
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
COMPILER_WARNINGS_FATAL=true
+endif
#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
endif
diff -r 42b57fb81c39 -r b2611b1a750c make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk Mon Aug 12 12:07:45 2013 -0700
+++ b/make/common/Defs-linux.gmk Wed Sep 04 18:20:38 2013 +0100
@@ -188,15 +188,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)
@@ -286,11 +297,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 42b57fb81c39 -r b2611b1a750c make/common/Library.gmk
--- a/make/common/Library.gmk Mon Aug 12 12:07:45 2013 -0700
+++ b/make/common/Library.gmk Wed Sep 04 18:20:38 2013 +0100
@@ -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.
- (set -e ; \
- $(CD) $(@D) ; \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
- )
+ (set -e ; \
+ $(CD) $(@D) ; \
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
+ $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+ $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
+ )
else # PLATFORM != solaris
- (set -e ; \
- $(CD) $(@D) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
- )
- endif # PLATFORM == solaris
+ (set -e ; \
+ $(CD) $(@D) ; \
+ $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+ $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \
+ )
+ endif # PLATFORM == solaris
+ endif # STRIP_POLICY != no_strip
ifeq ($(STRIP_POLICY),all_strip)
$(STRIP) $@
else
@@ -305,12 +307,14 @@
# implied else here is no stripping at all
endif
endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- (set -e ; \
- $(CD) $(@D) ; \
- $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
- )
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ (set -e ; \
+ $(CD) $(@D) ; \
+ $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+ $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \
+ )
+ endif
endif
endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS
endif # ENABLE_FULL_DEBUG_SYMBOLS
diff -r 42b57fb81c39 -r b2611b1a750c make/common/Program.gmk
--- a/make/common/Program.gmk Mon Aug 12 12:07:45 2013 -0700
+++ b/make/common/Program.gmk Wed Sep 04 18:20:38 2013 +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
@@ -126,6 +128,26 @@
endif # PLATFORM
#
+# Applications expect to be able to link against libjawt without invoking
+# System.loadLibrary("jawt") first. This was the behaviour described in the
+# devloper documentation of JAWT and what worked with OpenJDK6.
+#
+ifeq ($(PLATFORM), solaris)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)
+ LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)
+ else # ! ARCH_DATA_MODEL 64-bit
+ LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)
+ LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)
+ endif # ARCH_DATA_MODEL
+endif # PLATFORM SOLARIS
+ifeq ($(PLATFORM), linux)
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)
+endif # PLATFORM LINUX
+
+
+#
# Launcher specific files.
#
FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX)
@@ -250,7 +272,8 @@
ifneq ($(PLATFORM), macosx)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(PLATFORM), solaris)
+ 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
# empty section headers until a fixed $(OBJCOPY) is available.
@@ -260,19 +283,20 @@
#
# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
- (set -e ; \
- $(CD) $(@D) ; \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
- $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
- )
- else # PLATFORM != solaris
- (set -e ; \
- $(CD) $(@D) ; \
- $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
- $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
- )
- endif # PLATFORM == solaris
+ (set -e ; \
+ $(CD) $(@D) ; \
+ $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \
+ $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
+ $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \
+ )
+ else # PLATFORM != solaris
+ (set -e ; \
+ $(CD) $(@D) ; \
+ $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \
+ $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \
+ )
+ endif # PLATFORM == solaris
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(STRIP) $@
else
@@ -286,17 +310,19 @@
# implied else here is no stripping at all
endif
endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- (set -e ; \
- $(CD) $(@D) ; \
- $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
- $(RM) $(@F).debuginfo ; \
- )
- # save ZIP'ed debug info with rest of the program's build artifacts
- $(MV) $@.diz $(OBJDIR)
- else
- # save debug info with rest of the program's build artifacts
- $(MV) $@.debuginfo $(OBJDIR)
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ (set -e ; \
+ $(CD) $(@D) ; \
+ $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \
+ $(RM) $(@F).debuginfo ; \
+ )
+ # save ZIP'ed debug info with rest of the program's build artifacts
+ $(MV) $@.diz $(OBJDIR)
+ else
+ # save debug info with rest of the program's build artifacts
+ $(MV) $@.debuginfo $(OBJDIR)
+ endif
endif
endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS
endif # ENABLE_FULL_DEBUG_SYMBOLS
@@ -363,7 +389,9 @@
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
+ ifneq ($(SYSTEM_ZLIB), true)
+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ endif
endif
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
diff -r 42b57fb81c39 -r b2611b1a750c make/common/Release.gmk
--- a/make/common/Release.gmk Mon Aug 12 12:07:45 2013 -0700
+++ b/make/common/Release.gmk Wed Sep 04 18:20:38 2013 +0100
@@ -1116,13 +1116,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 ) \
@@ -1133,13 +1129,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 42b57fb81c39 -r b2611b1a750c make/common/shared/Compiler-gcc.gmk
--- a/make/common/shared/Compiler-gcc.gmk Mon Aug 12 12:07:45 2013 -0700
+++ b/make/common/shared/Compiler-gcc.gmk Wed Sep 04 18:20:38 2013 +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.*
More information about the distro-pkg-dev
mailing list