/hg/icedtea7-forest/hotspot: 34 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Aug 11 14:12:08 UTC 2014


changeset f5903ac3fef5 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=f5903ac3fef5
author: amurillo
date: Fri Apr 04 14:45:09 2014 -0700

	8039292: new hotspot build - hs24.80-b07
	Reviewed-by: jcoomes


changeset ed45fe52d455 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=ed45fe52d455
author: igerasim
date: Mon Mar 31 23:28:28 2014 +0400

	8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
	Reviewed-by: dholmes, sla


changeset 042420b675e8 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=042420b675e8
author: poonam
date: Wed Apr 09 09:14:16 2014 -0700

	8038440: backport few C2 fixes
	Summary: Backports few C2 fixes
	Reviewed-by: kvn, kevinw


changeset a40c5b54f6b3 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=a40c5b54f6b3
author: kevinw
date: Wed Apr 02 18:40:52 2014 +0200

	8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction
	Reviewed-by: dholmes, dsamersoff
	Contributed-by: andreas.eriksson at oracle.com


changeset 546d6ac32342 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=546d6ac32342
author: minqi
date: Fri Apr 11 12:19:16 2014 -0700

	7164841: Improvements to the GC log file rotation
	Summary: made changes to easily identify current log file in rotation. Parameterize the input with %t for time replacement in file name.
	Reviewed-by: ccheung, tschatzl, tamao, zgu
	Contributed-by: yumin.qi at oracle.com


changeset e3f749f6a37e in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=e3f749f6a37e
author: minqi
date: Fri Apr 11 12:31:17 2014 -0700

	7090324: gclog rotation via external tool
	Summary: GC log rotation can be set via java command line, but customer sometime need to sync with OS level rotation setting.
	Reviewed-by: sla, minqi, ehelin
	Contributed-by: suenaga.yasumasa at lab.ntt.co.jp


changeset 5f3441b7cae9 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=5f3441b7cae9
author: dholmes
date: Mon Apr 14 21:08:14 2014 -0400

	8039891: Remove ppcsflt builds from JPRT
	Reviewed-by: mikael, tbell


changeset ec76bacbb5b9 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=ec76bacbb5b9
author: katleman
date: Wed Apr 16 12:26:14 2014 -0700

	Added tag jdk7u60-b15 for changeset 2871f345b7e5


changeset 313550971712 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=313550971712
author: coffeys
date: Thu Apr 17 19:16:54 2014 +0100

	Merge


changeset 073b9c2f9afa in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=073b9c2f9afa
author: poonam
date: Tue Apr 22 18:11:40 2014 -0700

	8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info
	Summary: Full GC logs with -XX:+PrintGCDetails should contain perm gen size change info
	Reviewed-by: tschatzl, jmasa, kevinw


changeset cfea5eeb3a76 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=cfea5eeb3a76
author: sgabdura
date: Fri Apr 18 08:08:05 2014 +0200

	8040664: Revert temporary fix JDK-8038785
	Reviewed-by: kvn


changeset 3a2cedafb805 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=3a2cedafb805
author: sgabdura
date: Fri Apr 18 08:11:07 2014 +0200

	8039050: Crash in C2 compiler at Node::rematerialize
	Summary: Added missing calls to record_for_igvn() in loop opts. Added verification of def-use domination.
	Reviewed-by: kvn


changeset 4cf0cf96701d in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=4cf0cf96701d
author: sgabdura
date: Fri Apr 25 10:00:38 2014 +0200

	8041351: Crash in src/share/vm/opto/loopnode.cpp:3215 - assert(! had_error) failed: bad dominance
	Summary: add missing is_mem() check when we collect load nodes in SuperWord::co_locate_pack().
	Reviewed-by: iveresov, kvn


changeset 8f307c808d96 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=8f307c808d96
author: vkempik
date: Fri Apr 25 13:59:44 2014 +0200

	8024677: [TESTBUG] Move tests for classes in /testlibrary
	Reviewed-by: kvn, ctornqvi


changeset 5b145ed10803 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=5b145ed10803
author: vkempik
date: Thu Aug 22 11:52:27 2013 -0400

	7121403: [TESTBUG] runtime/7051189/Xchecksig.sh fails on 64bit solaris
	8023393: Need to suppress info message if -Xcheck:jni used with libjsig.dylab on Mac OSX
	Summary: Rewrite 7051189 test in Java, port Linux fix for 7051189 to Mac OSX.
	Reviewed-by: coleenp, dholmes, mseledtsov, ccheung


changeset b8ea0f9459e4 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=b8ea0f9459e4
author: amurillo
date: Wed Apr 30 15:00:06 2014 -0700

	8042247: Make 7u60 the default jprt release for hs24.80
	Reviewed-by: kvn, jcoomes


changeset d29bba282b08 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=d29bba282b08
author: kevinw
date: Tue May 06 16:15:00 2014 +0100

	8042250: Misleading command line output for ReservedCodeCacheSize validation
	Reviewed-by: kvn


changeset 80218f5d83ec in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=80218f5d83ec
author: sgabdura
date: Mon May 12 12:23:13 2014 +0200

	8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR))
	Summary: Convert the assert into the runtime check to skip IGVN optimizations for problematic memory nodes. Eliminate dead nodes more aggressively.
	Reviewed-by: kvn, twisti, iveresov


changeset 617a6338e0c4 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=617a6338e0c4
author: katleman
date: Wed Apr 23 11:33:38 2014 -0700

	Added tag jdk7u60-b16 for changeset ec76bacbb5b9


changeset 88de6e942079 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=88de6e942079
author: katleman
date: Tue Apr 29 12:12:34 2014 -0700

	Added tag jdk7u60-b18 for changeset 617a6338e0c4


changeset ec1a6bc3456c in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=ec1a6bc3456c
author: katleman
date: Wed Apr 30 13:48:40 2014 -0700

	Added tag jdk7u60-b17 for changeset 617a6338e0c4


changeset 361493c7cdb5 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=361493c7cdb5
author: katleman
date: Wed Apr 30 14:04:42 2014 -0700

	Merge


changeset 13f561930b3e in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=13f561930b3e
author: katleman
date: Wed May 07 19:26:16 2014 -0700

	Added tag jdk7u60-b19 for changeset 361493c7cdb5


changeset 56d83034446b in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=56d83034446b
author: coffeys
date: Sun May 11 21:36:45 2014 +0100

	Merge


changeset 9f942f05c968 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=9f942f05c968
author: coffeys
date: Mon May 12 15:03:19 2014 +0100

	Merge


changeset 89ea97c17f90 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=89ea97c17f90
author: katleman
date: Tue May 20 12:34:04 2014 -0700

	Added tag jdk7u80-b00 for changeset 05fe7a87d149


changeset 14f15bdfffcb in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=14f15bdfffcb
author: pliden
date: Tue May 20 10:24:30 2014 +0200

	8039042: G1: Phantom zeros in cardtable
	Reviewed-by: tschatzl, mgerdin


changeset dc59a0f4447e in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=dc59a0f4447e
author: brutisso
date: Thu Apr 17 13:13:07 2014 +0200

	8038925: Java with G1 crashes in dump_instance_fields using jmap or jcmd without fullgc
	Reviewed-by: brutisso, mgerdin
	Contributed-by: andreas.eriksson at oracle.com


changeset f290ac92cb22 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=f290ac92cb22
author: mikael
date: Tue Apr 29 22:04:09 2014 -0700

	8022070: Compilation error in stubGenerator_sparc.cpp with some compilers
	Reviewed-by: twisti, kvn


changeset ca8617d66b67 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=ca8617d66b67
author: mikael
date: Tue Apr 29 22:05:10 2014 -0700

	8042059: Various fixes to linux/sparc
	Reviewed-by: twisti, kvn


changeset b60f95bce6c2 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=b60f95bce6c2
author: mikael
date: Thu May 29 12:40:49 2014 -0700

	8043205: Incorrect system traps.h include path
	Reviewed-by: kvn, dholmes


changeset 5a83d40edceb in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=5a83d40edceb
author: mikael
date: Thu May 29 12:38:24 2014 -0700

	8043207: Add const to Address argument for Assembler::swap
	Reviewed-by: kvn, drchase


changeset e2533d62ca88 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=e2533d62ca88
author: lana
date: Tue Jun 03 09:59:36 2014 -0700

	Merge


changeset 42a819ab201a in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=42a819ab201a
author: andrew
date: Mon Aug 11 15:09:20 2014 +0100

	Merge jdk7u80-b01


diffstat:

 .hgtags                                                                              |     51 +
 .jcheck/conf                                                                         |      2 -
 agent/src/os/linux/Makefile                                                          |     11 +-
 agent/src/os/linux/libproc.h                                                         |     16 +-
 agent/src/os/linux/ps_proc.c                                                         |     52 +-
 make/Makefile                                                                        |     37 +
 make/aix/Makefile                                                                    |    380 +
 make/aix/adlc_updater                                                                |     20 +
 make/aix/build.sh                                                                    |     99 +
 make/aix/makefiles/adjust-mflags.sh                                                  |     87 +
 make/aix/makefiles/adlc.make                                                         |    234 +
 make/aix/makefiles/build_vm_def.sh                                                   |     18 +
 make/aix/makefiles/buildtree.make                                                    |    510 +
 make/aix/makefiles/compiler2.make                                                    |     32 +
 make/aix/makefiles/core.make                                                         |     33 +
 make/aix/makefiles/defs.make                                                         |    233 +
 make/aix/makefiles/dtrace.make                                                       |     27 +
 make/aix/makefiles/fastdebug.make                                                    |     73 +
 make/aix/makefiles/jsig.make                                                         |     95 +
 make/aix/makefiles/jvmg.make                                                         |     42 +
 make/aix/makefiles/jvmti.make                                                        |    118 +
 make/aix/makefiles/launcher.make                                                     |     97 +
 make/aix/makefiles/mapfile-vers-debug                                                |    270 +
 make/aix/makefiles/mapfile-vers-jsig                                                 |     38 +
 make/aix/makefiles/mapfile-vers-product                                              |    265 +
 make/aix/makefiles/ppc64.make                                                        |    108 +
 make/aix/makefiles/product.make                                                      |     59 +
 make/aix/makefiles/rules.make                                                        |    203 +
 make/aix/makefiles/sa.make                                                           |    116 +
 make/aix/makefiles/saproc.make                                                       |    125 +
 make/aix/makefiles/top.make                                                          |    144 +
 make/aix/makefiles/trace.make                                                        |    121 +
 make/aix/makefiles/vm.make                                                           |    384 +
 make/aix/makefiles/xlc.make                                                          |    180 +
 make/aix/platform_ppc64                                                              |     17 +
 make/defs.make                                                                       |     25 +-
 make/hotspot_version                                                                 |      2 +-
 make/jprt.properties                                                                 |     50 +-
 make/linux/Makefile                                                                  |      6 +-
 make/linux/makefiles/adlc.make                                                       |      2 +
 make/linux/makefiles/buildtree.make                                                  |     25 +-
 make/linux/makefiles/defs.make                                                       |     74 +-
 make/linux/makefiles/gcc.make                                                        |     38 +-
 make/linux/makefiles/jsig.make                                                       |      6 +-
 make/linux/makefiles/ppc64.make                                                      |     76 +
 make/linux/makefiles/rules.make                                                      |     15 +-
 make/linux/makefiles/saproc.make                                                     |      6 +-
 make/linux/makefiles/vm.make                                                         |     58 +-
 make/linux/makefiles/zeroshark.make                                                  |     37 +
 make/linux/platform_ppc                                                              |      6 +-
 make/linux/platform_ppc64                                                            |     17 +
 make/linux/platform_zero.in                                                          |      2 +-
 make/solaris/makefiles/adlc.make                                                     |      6 +-
 make/solaris/makefiles/dtrace.make                                                   |     16 +
 make/solaris/makefiles/gcc.make                                                      |      4 +-
 make/solaris/makefiles/jsig.make                                                     |      4 +
 make/solaris/makefiles/rules.make                                                    |     10 -
 make/solaris/makefiles/saproc.make                                                   |      4 +
 make/solaris/makefiles/vm.make                                                       |     12 +
 make/windows/makefiles/trace.make                                                    |      9 +-
 make/windows/makefiles/vm.make                                                       |      8 +
 src/cpu/ppc/vm/assembler_ppc.cpp                                                     |    700 +
 src/cpu/ppc/vm/assembler_ppc.hpp                                                     |   1990 +
 src/cpu/ppc/vm/assembler_ppc.inline.hpp                                              |    830 +
 src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp                                           |    105 +
 src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp                                    |    290 +
 src/cpu/ppc/vm/bytecodes_ppc.cpp                                                     |     31 +
 src/cpu/ppc/vm/bytecodes_ppc.hpp                                                     |     31 +
 src/cpu/ppc/vm/bytes_ppc.hpp                                                         |    281 +
 src/cpu/ppc/vm/c2_globals_ppc.hpp                                                    |     95 +
 src/cpu/ppc/vm/c2_init_ppc.cpp                                                       |     48 +
 src/cpu/ppc/vm/codeBuffer_ppc.hpp                                                    |     35 +
 src/cpu/ppc/vm/compile_ppc.cpp                                                       |     91 +
 src/cpu/ppc/vm/compile_ppc.hpp                                                       |     42 +
 src/cpu/ppc/vm/copy_ppc.hpp                                                          |    171 +
 src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp                                       |     43 +
 src/cpu/ppc/vm/cppInterpreter_ppc.cpp                                                |   3038 ++
 src/cpu/ppc/vm/cppInterpreter_ppc.hpp                                                |     39 +
 src/cpu/ppc/vm/debug_ppc.cpp                                                         |     35 +
 src/cpu/ppc/vm/depChecker_ppc.hpp                                                    |     31 +
 src/cpu/ppc/vm/disassembler_ppc.hpp                                                  |     37 +
 src/cpu/ppc/vm/dump_ppc.cpp                                                          |     62 +
 src/cpu/ppc/vm/frame_ppc.cpp                                                         |    320 +
 src/cpu/ppc/vm/frame_ppc.hpp                                                         |    534 +
 src/cpu/ppc/vm/frame_ppc.inline.hpp                                                  |    303 +
 src/cpu/ppc/vm/globalDefinitions_ppc.hpp                                             |     40 +
 src/cpu/ppc/vm/globals_ppc.hpp                                                       |    130 +
 src/cpu/ppc/vm/icBuffer_ppc.cpp                                                      |     71 +
 src/cpu/ppc/vm/icache_ppc.cpp                                                        |     77 +
 src/cpu/ppc/vm/icache_ppc.hpp                                                        |     52 +
 src/cpu/ppc/vm/interp_masm_ppc_64.cpp                                                |   2210 +
 src/cpu/ppc/vm/interp_masm_ppc_64.hpp                                                |    301 +
 src/cpu/ppc/vm/interpreterGenerator_ppc.hpp                                          |     37 +
 src/cpu/ppc/vm/interpreterRT_ppc.cpp                                                 |    155 +
 src/cpu/ppc/vm/interpreterRT_ppc.hpp                                                 |     62 +
 src/cpu/ppc/vm/interpreter_ppc.cpp                                                   |    802 +
 src/cpu/ppc/vm/interpreter_ppc.hpp                                                   |     50 +
 src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp                                               |     78 +
 src/cpu/ppc/vm/jniFastGetField_ppc.cpp                                               |     75 +
 src/cpu/ppc/vm/jniTypes_ppc.hpp                                                      |    110 +
 src/cpu/ppc/vm/jni_ppc.h                                                             |     55 +
 src/cpu/ppc/vm/macroAssembler_ppc.cpp                                                |   3061 ++
 src/cpu/ppc/vm/macroAssembler_ppc.hpp                                                |    705 +
 src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp                                         |    422 +
 src/cpu/ppc/vm/methodHandles_ppc.cpp                                                 |    558 +
 src/cpu/ppc/vm/methodHandles_ppc.hpp                                                 |     64 +
 src/cpu/ppc/vm/nativeInst_ppc.cpp                                                    |    378 +
 src/cpu/ppc/vm/nativeInst_ppc.hpp                                                    |    395 +
 src/cpu/ppc/vm/ppc.ad                                                                |  12870 ++++++++++
 src/cpu/ppc/vm/ppc_64.ad                                                             |     24 +
 src/cpu/ppc/vm/registerMap_ppc.hpp                                                   |     45 +
 src/cpu/ppc/vm/register_definitions_ppc.cpp                                          |     42 +
 src/cpu/ppc/vm/register_ppc.cpp                                                      |     77 +
 src/cpu/ppc/vm/register_ppc.hpp                                                      |    662 +
 src/cpu/ppc/vm/relocInfo_ppc.cpp                                                     |    139 +
 src/cpu/ppc/vm/relocInfo_ppc.hpp                                                     |     46 +
 src/cpu/ppc/vm/runtime_ppc.cpp                                                       |    191 +
 src/cpu/ppc/vm/sharedRuntime_ppc.cpp                                                 |   3263 ++
 src/cpu/ppc/vm/stubGenerator_ppc.cpp                                                 |   2119 +
 src/cpu/ppc/vm/stubRoutines_ppc_64.cpp                                               |     29 +
 src/cpu/ppc/vm/stubRoutines_ppc_64.hpp                                               |     40 +
 src/cpu/ppc/vm/templateInterpreterGenerator_ppc.hpp                                  |     44 +
 src/cpu/ppc/vm/templateInterpreter_ppc.cpp                                           |   1854 +
 src/cpu/ppc/vm/templateInterpreter_ppc.hpp                                           |     41 +
 src/cpu/ppc/vm/templateTable_ppc_64.cpp                                              |   4261 +++
 src/cpu/ppc/vm/templateTable_ppc_64.hpp                                              |     38 +
 src/cpu/ppc/vm/vmStructs_ppc.hpp                                                     |     41 +
 src/cpu/ppc/vm/vm_version_ppc.cpp                                                    |    487 +
 src/cpu/ppc/vm/vm_version_ppc.hpp                                                    |     96 +
 src/cpu/ppc/vm/vmreg_ppc.cpp                                                         |     51 +
 src/cpu/ppc/vm/vmreg_ppc.hpp                                                         |     35 +
 src/cpu/ppc/vm/vmreg_ppc.inline.hpp                                                  |     71 +
 src/cpu/ppc/vm/vtableStubs_ppc_64.cpp                                                |    269 +
 src/cpu/sparc/vm/assembler_sparc.hpp                                                 |      2 +-
 src/cpu/sparc/vm/assembler_sparc.inline.hpp                                          |      2 +-
 src/cpu/sparc/vm/compile_sparc.hpp                                                   |     39 +
 src/cpu/sparc/vm/frame_sparc.hpp                                                     |      4 +-
 src/cpu/sparc/vm/frame_sparc.inline.hpp                                              |     11 +
 src/cpu/sparc/vm/globals_sparc.hpp                                                   |      5 +
 src/cpu/sparc/vm/methodHandles_sparc.hpp                                             |      6 +-
 src/cpu/sparc/vm/sharedRuntime_sparc.cpp                                             |     10 +-
 src/cpu/sparc/vm/sparc.ad                                                            |     16 +-
 src/cpu/sparc/vm/stubGenerator_sparc.cpp                                             |     10 +-
 src/cpu/x86/vm/c2_globals_x86.hpp                                                    |      2 +-
 src/cpu/x86/vm/compile_x86.hpp                                                       |     39 +
 src/cpu/x86/vm/frame_x86.inline.hpp                                                  |      4 +
 src/cpu/x86/vm/globals_x86.hpp                                                       |      7 +-
 src/cpu/x86/vm/methodHandles_x86.hpp                                                 |      6 +-
 src/cpu/x86/vm/sharedRuntime_x86_32.cpp                                              |     11 +-
 src/cpu/x86/vm/sharedRuntime_x86_64.cpp                                              |     11 +-
 src/cpu/x86/vm/x86_32.ad                                                             |     14 +-
 src/cpu/x86/vm/x86_64.ad                                                             |     14 +-
 src/cpu/zero/vm/arm_cas.S                                                            |     31 +
 src/cpu/zero/vm/asm_helper.cpp                                                       |    745 +
 src/cpu/zero/vm/bytecodes_arm.def                                                    |   7850 ++++++
 src/cpu/zero/vm/bytecodes_zero.cpp                                                   |     52 +-
 src/cpu/zero/vm/bytecodes_zero.hpp                                                   |     41 +-
 src/cpu/zero/vm/compile_zero.hpp                                                     |     40 +
 src/cpu/zero/vm/cppInterpreter_arm.S                                                 |   7384 +++++
 src/cpu/zero/vm/cppInterpreter_zero.cpp                                              |     51 +-
 src/cpu/zero/vm/cppInterpreter_zero.hpp                                              |      2 +
 src/cpu/zero/vm/globals_zero.hpp                                                     |      9 +-
 src/cpu/zero/vm/methodHandles_zero.hpp                                               |     12 +-
 src/cpu/zero/vm/sharedRuntime_zero.cpp                                               |     10 +-
 src/cpu/zero/vm/shark_globals_zero.hpp                                               |      1 -
 src/cpu/zero/vm/thumb2.cpp                                                           |   7985 ++++++
 src/cpu/zero/vm/vm_version_zero.hpp                                                  |     11 +
 src/os/aix/vm/attachListener_aix.cpp                                                 |    574 +
 src/os/aix/vm/c2_globals_aix.hpp                                                     |     37 +
 src/os/aix/vm/chaitin_aix.cpp                                                        |     38 +
 src/os/aix/vm/decoder_aix.hpp                                                        |     48 +
 src/os/aix/vm/globals_aix.hpp                                                        |     63 +
 src/os/aix/vm/interfaceSupport_aix.hpp                                               |     35 +
 src/os/aix/vm/jsig.c                                                                 |    233 +
 src/os/aix/vm/jvm_aix.cpp                                                            |    201 +
 src/os/aix/vm/jvm_aix.h                                                              |    123 +
 src/os/aix/vm/libperfstat_aix.cpp                                                    |    124 +
 src/os/aix/vm/libperfstat_aix.hpp                                                    |     59 +
 src/os/aix/vm/loadlib_aix.cpp                                                        |    185 +
 src/os/aix/vm/loadlib_aix.hpp                                                        |    128 +
 src/os/aix/vm/mutex_aix.inline.hpp                                                   |     37 +
 src/os/aix/vm/osThread_aix.cpp                                                       |     58 +
 src/os/aix/vm/osThread_aix.hpp                                                       |    144 +
 src/os/aix/vm/os_aix.cpp                                                             |   5131 +++
 src/os/aix/vm/os_aix.hpp                                                             |    381 +
 src/os/aix/vm/os_aix.inline.hpp                                                      |    294 +
 src/os/aix/vm/os_share_aix.hpp                                                       |     37 +
 src/os/aix/vm/perfMemory_aix.cpp                                                     |   1026 +
 src/os/aix/vm/porting_aix.cpp                                                        |    369 +
 src/os/aix/vm/porting_aix.hpp                                                        |     81 +
 src/os/aix/vm/threadCritical_aix.cpp                                                 |     68 +
 src/os/aix/vm/thread_aix.inline.hpp                                                  |     42 +
 src/os/aix/vm/vmError_aix.cpp                                                        |    122 +
 src/os/bsd/vm/os_bsd.cpp                                                             |     23 +-
 src/os/linux/vm/decoder_linux.cpp                                                    |      6 +
 src/os/linux/vm/os_linux.cpp                                                         |    226 +-
 src/os/linux/vm/os_linux.hpp                                                         |      3 +
 src/os/posix/launcher/java_md.c                                                      |     13 +-
 src/os/posix/vm/os_posix.cpp                                                         |    491 +-
 src/os/posix/vm/os_posix.hpp                                                         |     28 +-
 src/os/solaris/vm/os_solaris.hpp                                                     |      3 +
 src/os/windows/vm/os_windows.hpp                                                     |      3 +
 src/os_cpu/aix_ppc/vm/aix_ppc_64.ad                                                  |     24 +
 src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp                                      |    401 +
 src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp                                            |     54 +
 src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp                                 |    151 +
 src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp                                                 |    567 +
 src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp                                                 |     35 +
 src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp                                    |     58 +
 src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp                                           |     40 +
 src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp                                           |     36 +
 src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp                                             |     36 +
 src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp                                             |     79 +
 src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp                                          |     66 +
 src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp                                               |      2 +-
 src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp                                  |    401 +
 src/os_cpu/linux_ppc/vm/bytes_linux_ppc.inline.hpp                                   |     39 +
 src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp                                        |     54 +
 src/os_cpu/linux_ppc/vm/linux_ppc_64.ad                                              |     24 +
 src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp                             |    149 +
 src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp                                             |    620 +
 src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp                                             |     35 +
 src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp                                |     50 +
 src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp                                       |     40 +
 src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp                                       |     36 +
 src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp                                         |     36 +
 src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp                                         |     83 +
 src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp                                      |     66 +
 src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp                                  |      2 +-
 src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp                              |      4 +-
 src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp                                         |     33 +-
 src/os_cpu/linux_x86/vm/os_linux_x86.cpp                                             |      2 +-
 src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp                                |     14 +
 src/os_cpu/linux_zero/vm/globals_linux_zero.hpp                                      |      8 +-
 src/os_cpu/linux_zero/vm/os_linux_zero.cpp                                           |     47 +-
 src/os_cpu/linux_zero/vm/os_linux_zero.hpp                                           |      8 +-
 src/share/tools/hsdis/Makefile                                                       |     11 +-
 src/share/tools/hsdis/hsdis-demo.c                                                   |      9 +-
 src/share/tools/hsdis/hsdis.c                                                        |      8 +
 src/share/vm/adlc/adlparse.cpp                                                       |    188 +-
 src/share/vm/adlc/adlparse.hpp                                                       |      4 +-
 src/share/vm/adlc/archDesc.hpp                                                       |      2 +
 src/share/vm/adlc/formssel.cpp                                                       |     89 +-
 src/share/vm/adlc/formssel.hpp                                                       |      3 +
 src/share/vm/adlc/main.cpp                                                           |      7 +
 src/share/vm/adlc/output_c.cpp                                                       |    187 +-
 src/share/vm/adlc/output_h.cpp                                                       |     41 +-
 src/share/vm/asm/assembler.cpp                                                       |     33 +-
 src/share/vm/asm/assembler.hpp                                                       |     22 +-
 src/share/vm/asm/codeBuffer.cpp                                                      |     15 +-
 src/share/vm/asm/codeBuffer.hpp                                                      |      6 +-
 src/share/vm/c1/c1_FrameMap.cpp                                                      |      2 +-
 src/share/vm/c1/c1_globals.hpp                                                       |      3 +
 src/share/vm/ci/ciTypeFlow.cpp                                                       |      2 +-
 src/share/vm/classfile/classFileParser.cpp                                           |      7 +-
 src/share/vm/classfile/classLoader.cpp                                               |      3 +
 src/share/vm/classfile/javaClasses.cpp                                               |      3 +
 src/share/vm/classfile/systemDictionary.cpp                                          |      1 -
 src/share/vm/code/compiledIC.cpp                                                     |     11 +-
 src/share/vm/code/compiledIC.hpp                                                     |      4 +
 src/share/vm/code/nmethod.cpp                                                        |      7 +-
 src/share/vm/code/relocInfo.cpp                                                      |     37 +
 src/share/vm/code/relocInfo.hpp                                                      |     46 +-
 src/share/vm/code/stubs.hpp                                                          |      3 +
 src/share/vm/code/vmreg.hpp                                                          |     15 +-
 src/share/vm/compiler/disassembler.hpp                                               |      3 +
 src/share/vm/compiler/methodLiveness.cpp                                             |     12 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp         |      3 +
 src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp            |      3 +
 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp      |     28 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp |      6 +-
 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp     |      3 +
 src/share/vm/gc_implementation/g1/concurrentMark.cpp                                 |      2 +-
 src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp                                 |      3 +
 src/share/vm/gc_implementation/g1/g1AllocRegion.hpp                                  |      7 +-
 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp                                |      6 +-
 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp                              |    111 +-
 src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp                              |     22 +-
 src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp                           |      1 +
 src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp                        |     23 +-
 src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp                        |      2 +-
 src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp                               |      2 +-
 src/share/vm/gc_implementation/g1/ptrQueue.cpp                                       |      3 +
 src/share/vm/gc_implementation/parNew/parNewGeneration.cpp                           |      2 +-
 src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp                    |      5 +-
 src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp                |      4 +-
 src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp                        |      2 +-
 src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp        |      1 +
 src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp                   |      3 +
 src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp                           |      3 +
 src/share/vm/gc_interface/collectedHeap.cpp                                          |      3 +
 src/share/vm/gc_interface/collectedHeap.inline.hpp                                   |      3 +
 src/share/vm/interpreter/abstractInterpreter.hpp                                     |     10 +-
 src/share/vm/interpreter/bytecodeInterpreter.cpp                                     |    965 +-
 src/share/vm/interpreter/bytecodeInterpreter.hpp                                     |     25 +-
 src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp                            |    305 +
 src/share/vm/interpreter/interpreterRuntime.cpp                                      |     42 +-
 src/share/vm/interpreter/interpreterRuntime.hpp                                      |     22 +-
 src/share/vm/interpreter/invocationCounter.hpp                                       |     22 +-
 src/share/vm/interpreter/linkResolver.cpp                                            |      3 +
 src/share/vm/interpreter/templateTable.hpp                                           |     14 +-
 src/share/vm/libadt/port.hpp                                                         |      5 +-
 src/share/vm/memory/allocation.cpp                                                   |      3 +
 src/share/vm/memory/barrierSet.hpp                                                   |      4 +-
 src/share/vm/memory/barrierSet.inline.hpp                                            |      6 +-
 src/share/vm/memory/cardTableModRefBS.cpp                                            |      4 +-
 src/share/vm/memory/cardTableModRefBS.hpp                                            |     11 +-
 src/share/vm/memory/collectorPolicy.cpp                                              |     21 +-
 src/share/vm/memory/defNewGeneration.cpp                                             |      3 +
 src/share/vm/memory/gcLocker.hpp                                                     |      4 +
 src/share/vm/memory/genMarkSweep.cpp                                                 |      3 +
 src/share/vm/memory/modRefBarrierSet.hpp                                             |      2 +-
 src/share/vm/memory/resourceArea.cpp                                                 |      3 +
 src/share/vm/memory/resourceArea.hpp                                                 |      3 +
 src/share/vm/memory/space.hpp                                                        |      3 +
 src/share/vm/memory/threadLocalAllocBuffer.cpp                                       |      5 +-
 src/share/vm/memory/universe.cpp                                                     |     13 +-
 src/share/vm/oops/constantPoolKlass.cpp                                              |      3 +
 src/share/vm/oops/cpCacheOop.cpp                                                     |      4 +-
 src/share/vm/oops/cpCacheOop.hpp                                                     |     32 +-
 src/share/vm/oops/instanceKlass.cpp                                                  |     11 +-
 src/share/vm/oops/markOop.cpp                                                        |      3 +
 src/share/vm/oops/methodDataOop.cpp                                                  |      6 +
 src/share/vm/oops/methodDataOop.hpp                                                  |    191 +
 src/share/vm/oops/methodOop.hpp                                                      |      5 +-
 src/share/vm/oops/objArrayKlass.cpp                                                  |      2 +-
 src/share/vm/oops/objArrayKlass.inline.hpp                                           |      4 +-
 src/share/vm/oops/oop.cpp                                                            |      3 +
 src/share/vm/oops/oop.inline.hpp                                                     |     16 +-
 src/share/vm/oops/oopsHierarchy.cpp                                                  |      3 +
 src/share/vm/oops/typeArrayOop.hpp                                                   |      3 +
 src/share/vm/opto/block.cpp                                                          |    359 +-
 src/share/vm/opto/block.hpp                                                          |      8 +-
 src/share/vm/opto/c2_globals.hpp                                                     |     12 +-
 src/share/vm/opto/c2compiler.cpp                                                     |      7 +-
 src/share/vm/opto/callGenerator.cpp                                                  |      2 +-
 src/share/vm/opto/callnode.cpp                                                       |      4 +-
 src/share/vm/opto/chaitin.cpp                                                        |      8 +-
 src/share/vm/opto/compile.cpp                                                        |     48 +-
 src/share/vm/opto/compile.hpp                                                        |     14 +-
 src/share/vm/opto/gcm.cpp                                                            |      8 +-
 src/share/vm/opto/generateOptoStub.cpp                                               |     71 +-
 src/share/vm/opto/graphKit.cpp                                                       |     32 +-
 src/share/vm/opto/graphKit.hpp                                                       |     46 +-
 src/share/vm/opto/idealGraphPrinter.cpp                                              |      4 +-
 src/share/vm/opto/idealKit.cpp                                                       |      8 +-
 src/share/vm/opto/idealKit.hpp                                                       |      3 +-
 src/share/vm/opto/lcm.cpp                                                            |     43 +-
 src/share/vm/opto/library_call.cpp                                                   |     28 +-
 src/share/vm/opto/locknode.hpp                                                       |      7 +-
 src/share/vm/opto/loopTransform.cpp                                                  |     26 +-
 src/share/vm/opto/loopnode.cpp                                                       |     31 +-
 src/share/vm/opto/loopopts.cpp                                                       |      1 +
 src/share/vm/opto/machnode.cpp                                                       |     14 +
 src/share/vm/opto/machnode.hpp                                                       |     28 +
 src/share/vm/opto/macro.cpp                                                          |      2 +-
 src/share/vm/opto/matcher.cpp                                                        |     72 +-
 src/share/vm/opto/matcher.hpp                                                        |      5 +
 src/share/vm/opto/memnode.cpp                                                        |     88 +-
 src/share/vm/opto/memnode.hpp                                                        |    175 +-
 src/share/vm/opto/node.cpp                                                           |     36 +-
 src/share/vm/opto/node.hpp                                                           |     14 +-
 src/share/vm/opto/output.cpp                                                         |     27 +-
 src/share/vm/opto/output.hpp                                                         |      7 +-
 src/share/vm/opto/parse.hpp                                                          |      7 +
 src/share/vm/opto/parse1.cpp                                                         |     31 +-
 src/share/vm/opto/parse2.cpp                                                         |      4 +-
 src/share/vm/opto/parse3.cpp                                                         |     42 +-
 src/share/vm/opto/postaloc.cpp                                                       |      7 +-
 src/share/vm/opto/reg_split.cpp                                                      |     11 +
 src/share/vm/opto/regalloc.cpp                                                       |      4 +-
 src/share/vm/opto/regmask.cpp                                                        |      7 +-
 src/share/vm/opto/regmask.hpp                                                        |      7 +-
 src/share/vm/opto/runtime.cpp                                                        |     31 +-
 src/share/vm/opto/runtime.hpp                                                        |      2 +-
 src/share/vm/opto/superword.cpp                                                      |      3 +-
 src/share/vm/opto/type.cpp                                                           |      1 +
 src/share/vm/opto/type.hpp                                                           |      3 +
 src/share/vm/opto/vectornode.hpp                                                     |      2 +-
 src/share/vm/prims/forte.cpp                                                         |      8 +-
 src/share/vm/prims/jni.cpp                                                           |     10 +-
 src/share/vm/prims/jvm.cpp                                                           |      5 +-
 src/share/vm/prims/jvm.h                                                             |      3 +
 src/share/vm/prims/jvmtiEnv.cpp                                                      |      6 +
 src/share/vm/prims/jvmtiExport.cpp                                                   |     41 +
 src/share/vm/prims/jvmtiExport.hpp                                                   |      7 +
 src/share/vm/prims/jvmtiImpl.cpp                                                     |      3 +
 src/share/vm/prims/jvmtiManageCapabilities.cpp                                       |      4 +-
 src/share/vm/prims/methodHandles.cpp                                                 |      4 +-
 src/share/vm/prims/nativeLookup.cpp                                                  |      3 +
 src/share/vm/prims/unsafe.cpp                                                        |      4 +-
 src/share/vm/runtime/arguments.cpp                                                   |    101 +-
 src/share/vm/runtime/atomic.cpp                                                      |      6 +
 src/share/vm/runtime/biasedLocking.cpp                                               |      6 +-
 src/share/vm/runtime/deoptimization.cpp                                              |      7 +-
 src/share/vm/runtime/fprofiler.hpp                                                   |      3 +
 src/share/vm/runtime/frame.cpp                                                       |     15 +-
 src/share/vm/runtime/frame.hpp                                                       |     13 +-
 src/share/vm/runtime/frame.inline.hpp                                                |      7 +
 src/share/vm/runtime/globals.hpp                                                     |     34 +-
 src/share/vm/runtime/handles.cpp                                                     |      4 +
 src/share/vm/runtime/handles.inline.hpp                                              |      3 +
 src/share/vm/runtime/interfaceSupport.hpp                                            |      6 +
 src/share/vm/runtime/java.cpp                                                        |      3 +
 src/share/vm/runtime/javaCalls.cpp                                                   |      3 +
 src/share/vm/runtime/javaCalls.hpp                                                   |      3 +
 src/share/vm/runtime/javaFrameAnchor.hpp                                             |      3 +
 src/share/vm/runtime/jniHandles.cpp                                                  |      3 +
 src/share/vm/runtime/memprofiler.cpp                                                 |      3 +
 src/share/vm/runtime/mutex.cpp                                                       |      4 +
 src/share/vm/runtime/mutexLocker.cpp                                                 |      3 +
 src/share/vm/runtime/mutexLocker.hpp                                                 |      3 +
 src/share/vm/runtime/objectMonitor.cpp                                               |     20 +-
 src/share/vm/runtime/os.cpp                                                          |     45 +-
 src/share/vm/runtime/os.hpp                                                          |     17 +-
 src/share/vm/runtime/osThread.hpp                                                    |      3 +
 src/share/vm/runtime/safepoint.cpp                                                   |      9 +-
 src/share/vm/runtime/sharedRuntime.cpp                                               |     69 +-
 src/share/vm/runtime/sharedRuntime.hpp                                               |     27 +-
 src/share/vm/runtime/sharedRuntimeTrans.cpp                                          |      4 +
 src/share/vm/runtime/sharedRuntimeTrig.cpp                                           |      7 +
 src/share/vm/runtime/stubRoutines.cpp                                                |      9 +
 src/share/vm/runtime/stubRoutines.hpp                                                |     65 +-
 src/share/vm/runtime/sweeper.cpp                                                     |      3 +-
 src/share/vm/runtime/synchronizer.cpp                                                |     17 +-
 src/share/vm/runtime/task.cpp                                                        |      4 +
 src/share/vm/runtime/thread.cpp                                                      |      7 +
 src/share/vm/runtime/thread.hpp                                                      |     32 +-
 src/share/vm/runtime/threadLocalStorage.cpp                                          |      4 +
 src/share/vm/runtime/threadLocalStorage.hpp                                          |      3 +
 src/share/vm/runtime/timer.cpp                                                       |      3 +
 src/share/vm/runtime/virtualspace.cpp                                                |      3 +
 src/share/vm/runtime/vmStructs.cpp                                                   |     13 +-
 src/share/vm/runtime/vmThread.cpp                                                    |      6 +
 src/share/vm/runtime/vmThread.hpp                                                    |      3 +
 src/share/vm/runtime/vm_operations.cpp                                               |      3 +
 src/share/vm/runtime/vm_operations.hpp                                               |     14 +-
 src/share/vm/runtime/vm_version.cpp                                                  |      9 +-
 src/share/vm/services/diagnosticCommand.cpp                                          |     10 +-
 src/share/vm/services/diagnosticCommand.hpp                                          |     12 +-
 src/share/vm/services/heapDumper.cpp                                                 |      2 +-
 src/share/vm/shark/sharkCompiler.cpp                                                 |      6 +-
 src/share/vm/shark/shark_globals.hpp                                                 |     10 +
 src/share/vm/trace/trace.dtd                                                         |      3 -
 src/share/vm/utilities/accessFlags.cpp                                               |      3 +
 src/share/vm/utilities/array.cpp                                                     |      3 +
 src/share/vm/utilities/bitMap.cpp                                                    |      3 +
 src/share/vm/utilities/bitMap.hpp                                                    |      2 +-
 src/share/vm/utilities/bitMap.inline.hpp                                             |     20 +-
 src/share/vm/utilities/debug.cpp                                                     |      4 +
 src/share/vm/utilities/debug.hpp                                                     |      2 +-
 src/share/vm/utilities/decoder.cpp                                                   |      4 +
 src/share/vm/utilities/decoder_elf.cpp                                               |      2 +-
 src/share/vm/utilities/decoder_elf.hpp                                               |      4 +-
 src/share/vm/utilities/elfFile.cpp                                                   |     52 +-
 src/share/vm/utilities/elfFile.hpp                                                   |      8 +-
 src/share/vm/utilities/elfFuncDescTable.cpp                                          |    104 +
 src/share/vm/utilities/elfFuncDescTable.hpp                                          |    149 +
 src/share/vm/utilities/elfStringTable.cpp                                            |      4 +-
 src/share/vm/utilities/elfStringTable.hpp                                            |      2 +-
 src/share/vm/utilities/elfSymbolTable.cpp                                            |     38 +-
 src/share/vm/utilities/elfSymbolTable.hpp                                            |      6 +-
 src/share/vm/utilities/events.cpp                                                    |      3 +
 src/share/vm/utilities/exceptions.cpp                                                |      3 +
 src/share/vm/utilities/globalDefinitions.hpp                                         |      6 +
 src/share/vm/utilities/globalDefinitions_xlc.hpp                                     |    202 +
 src/share/vm/utilities/growableArray.cpp                                             |      3 +
 src/share/vm/utilities/histogram.hpp                                                 |      3 +
 src/share/vm/utilities/macros.hpp                                                    |     44 +-
 src/share/vm/utilities/ostream.cpp                                                   |    412 +-
 src/share/vm/utilities/ostream.hpp                                                   |     31 +-
 src/share/vm/utilities/preserveException.hpp                                         |      3 +
 src/share/vm/utilities/taskqueue.cpp                                                 |      3 +
 src/share/vm/utilities/taskqueue.hpp                                                 |    114 +-
 src/share/vm/utilities/vmError.cpp                                                   |     23 +-
 src/share/vm/utilities/vmError.hpp                                                   |      8 +
 src/share/vm/utilities/workgroup.hpp                                                 |      3 +
 test/gc/g1/TestPrintGCDetails.java                                                   |     57 +
 test/gc/heap_inspection/TestG1ConcurrentGCHeapDump.java                              |    108 +
 test/runtime/7020373/GenOOMCrashClass.java                                           |    157 +
 test/runtime/7020373/Test7020373.sh                                                  |      4 +
 test/runtime/7020373/testcase.jar                                                    |    Bin 
 test/runtime/7051189/Xchecksig.sh                                                    |    126 -
 test/runtime/InitialThreadOverflow/DoOverflow.java                                   |     41 +
 test/runtime/InitialThreadOverflow/invoke.cxx                                        |     70 +
 test/runtime/InitialThreadOverflow/testme.sh                                         |     73 +
 test/runtime/XCheckJniJsig/XCheckJSig.java                                           |     82 +
 test/testlibrary_tests/AssertsTest.java                                              |    237 +
 test/testlibrary_tests/OutputAnalyzerReportingTest.java                              |    124 +
 test/testlibrary_tests/OutputAnalyzerTest.java                                       |    193 +
 tools/mkbc.c                                                                         |    607 +
 491 files changed, 95411 insertions(+), 1625 deletions(-)

diffs (truncated from 105949 to 500 lines):

diff -r 98fafba890cb -r 42a819ab201a .hgtags
--- a/.hgtags	Tue Apr 08 08:45:26 2014 -0700
+++ b/.hgtags	Mon Aug 11 15:09:20 2014 +0100
@@ -50,6 +50,7 @@
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12
 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
@@ -87,6 +88,7 @@
 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
+a393ff93e7e54dd94cc4211892605a32f9c77dad icedtea7-1.13
 15836273ac2494f36ef62088bc1cb6f3f011f565 jdk7-b89
 4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b hs18-b02
 605c9707a766ff518cd841fc04f9bb4b36a3a30b jdk7-b90
@@ -160,6 +162,7 @@
 b898f0fc3cedc972d884d31a751afd75969531cf hs21-b05
 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 jdk7-b136
 bd586e392d93b7ed7a1636dcc8da2b6a4203a102 hs21-b06
+591c7dc0b2ee879f87a7b5519a5388e0d81520be icedtea-1.14
 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f jdk7-b137
 2dbcb4a4d8dace5fe78ceb563b134f1fb296cd8f hs21-b07
 0930dc920c185afbf40fed9a655290b8e5b16783 jdk7-b138
@@ -182,6 +185,7 @@
 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
 81d815b05abb564aa1f4100ae13491c949b9a07e hs21-b17
+7693eb0fce1f6b484cce96c233ea20bdad8a09e0 icedtea-2.0-branchpoint
 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
@@ -210,6 +214,7 @@
 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10
 f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13
 0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21
+f8f4d3f9b16567b91bcef4caaa8417c8de8015f0 icedtea-2.1-branchpoint
 a40d238623e5b1ab1224ea6b36dc5b23d0a53880 jdk7u3-b02
 6986bfb4c82e00b938c140f2202133350e6e73f8 jdk7u3-b03
 8e6375b46717d74d4885f839b4e72d03f357a45f jdk7u3-b04
@@ -264,6 +269,7 @@
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
 f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
 931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+a2c5354863dcb3d147b7b6f55ef514b1bfecf920 icedtea-2.2-branchpoint
 efb5f2662c96c472caa3327090268c75a86dd9c0 jdk7u4-b13
 82e719a2e6416838b4421637646cbfd7104c7716 jdk7u4-b14
 e5f7f95411fb9e837800b4152741c962118e5d7a jdk7u5-b01
@@ -302,6 +308,9 @@
 e974e15945658e574e6c344c4a7ba225f5708c10 hs23.2-b03
 f08a3a0e60c32cb0e8350e72fdc54849759096a4 jdk7u6-b12
 7a8d3cd6562170f4c262e962270f679ac503f456 hs23.2-b04
+d72dd66fdc3d52aee909f8dd8f25f62f13569ffa ppc-aix-port-b01
+1efaab66c81d0a5701cc819e67376f1b27bfea47 ppc-aix-port-b02
+b69b779a26dfc5e2333504d0c82fc998ff915499 ppc-aix-port-b03
 28746e6d615f27816f483485a53b790c7a463f0c jdk7u6-b13
 202880d633e646d4936798d0fba6efc0cab04dc8 hs23.2-b05
 6b0f178141388f5721aa5365cb542715acbf0cc7 jdk7u6-b14
@@ -311,6 +320,7 @@
 cefe884c708aa6dfd63aff45f6c698a6bc346791 jdk7u6-b16
 270a40a57b3d05ca64070208dcbb895b5b509d8e hs23.2-b08
 7a37cec9d0d44ae6ea3d26a95407e42d99af6843 jdk7u6-b17
+354cfde7db2f1fd46312d883a63c8a76d5381bab icedtea-2.3-branchpoint
 df0df4ae5af2f40b7f630c53a86e8c3d68ef5b66 jdk7u6-b18
 1257f4373a06f788bd656ae1c7a953a026a285b9 jdk7u6-b19
 a0c2fa4baeb6aad6f33dc87b676b21345794d61e hs23.2-b09
@@ -440,6 +450,7 @@
 4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07
 3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08
 92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09
+6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint
 7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29
 181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10
 4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30
@@ -496,6 +507,7 @@
 273e8afccd6ef9e10e9fe121f7b323755191f3cc jdk7u25-b32
 e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
+ca298f18e21dc66c6b5235600f8b50bcc9bbaa38 ppc-aix-port-b04
 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
 be21f8a4d42c03cafde4f616fd80ece791ba2f21 hs24-b35
 10e0043bda0878dbc85f3f280157eab592b47c91 jdk7u14-b16
@@ -590,8 +602,12 @@
 12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
 3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
 520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31
+ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
+af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
 c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33
 0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34
+12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35
 429884602206fcf5314c8b953c06d54d337558ca jdk7u51-b00
 68f03ff066f2341b89b52a6d6e21ae09de008351 jdk7u51-b01
 67910a581eca113847c5320c49436a9816c5d5c6 jdk7u51-b02
@@ -608,6 +624,26 @@
 6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
 a398ddc79d2310ad37b131cc3794b3cf574f088e jdk7u51-b30
 cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
+208419914859dd77abdb5ec755b32c237ee6e4eb jdk7u51-b33
+f8457a75bdb5052f1d8c547027a926f9b755b808 jdk7u51-b34
+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u55-b00
+ac0063b4452bc724e8648e64f4b2d495054bb308 jdk7u55-b01
+408028d410e316a99495c42df0031018890c22fe jdk7u55-b02
+50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03
+3be3b8a032a5508646c1c5620cee18d3e69fc708 jdk7u55-b04
+b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u55-b05
+260d919d52e500a0b20f911fade2a7710474067a jdk7u55-b06
+8cf6e0a3a0651c4132ae034c2b68ddf4eb5c4d88 jdk7u55-b07
+049fd2cef85bf2d557dd7dd8a90a6831a8168ce4 jdk7u55-b08
+9b238ab164e6d1cf9cfb560827d88ef8a7d8c898 jdk7u55-b09
+573d8d080af9eff48aa3b8f0696d8874ce36fbb1 jdk7u55-b09
+36f8bd4dd467ae4183340842fd7158ac3309b826 jdk7u55-b10
+49cada8e39b9215b9fd8b9183743f92625587cfc jdk7u55-b11
+aadc864abd1ced3049bf59ce32786a07997ba190 jdk7u55-b12
+b021fd817a0177b31d1e3d65127a27458e85801e jdk7u55-b13
+d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30
+dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14
+8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31
 ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
 af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
 cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
@@ -618,6 +654,8 @@
 0025a2a965c8f21376278245c2493d8861386fba jdk7u60-b02
 fa59add77d1a8f601a695f137248462fdc68cc2f hs24.60-b05
 a59134ccb1b704b2cd05e157970d425af43e5437 hs24.60-b06
+bc178be7e9d6fcc97e09c909ffe79d96e2305218 icedtea-2.5pre01
+f30e87f16d90f1e659b935515a3fc083ab8a0156 icedtea-2.5pre02
 2c971ed884cec0a9293ccff3def696da81823225 jdk7u60-b03
 1afbeb8cb558429156d432f35e7582716053a9cb hs24.60-b07
 05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u60-b04
@@ -631,10 +669,23 @@
 a2ac67a2c1cc867a8d6b525ab1df17204186e636 jdk7u60-b11
 cae50351dcece6e5bf215eabf958c5d669ffff1f jdk7u60-b12
 5853131ba4b448c5d89a3f0aa501fdf07f3b473c jdk7u60-b13
+b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
+2871f345b7e5585e20dc7aa91035967fe774cfba jdk7u60-b15
+ec76bacbb5b90efc7988dee5345c656126b97561 jdk7u60-b16
+617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18
+617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17
+361493c7cdb5f75b28efc63389d6cebaaaa43a2c jdk7u60-b19
 b92f390febd01615af4a736b4f830f6052aa1d09 hs24.80-b00
 1448ebfef4f1aae0174eca983ad05507730ca6fd hs24.80-b01
 b1d29549dca7e36a4d050af5a54f8f56963a5c7d hs24.80-b02
 ff18bcebe2943527cdbc094375c38c27ec7f2442 hs24.80-b03
 1b9722b5134a8e565d8b8fe851849e034beff057 hs24.80-b04
 04d6919c44db8c9d811ef0ac4775a579f854cdfc hs24.80-b05
+882a93010fb90f928331bf31a226992755d6cfb2 icedtea-2.6pre01
 ee18e60e7e8da9f1912895af353564de0330a2b1 hs24.80-b06
+138ef7288fd40de0012a3a24839fa7cb3569ab43 icedtea-2.6pre02
+4ab69c6e4c85edf628c01c685bc12c591b9807d9 icedtea-2.6pre03
+b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14
+2fd819c8b5066a480f9524d901dbd34f2cf563ad icedtea-2.6pre04
+fae3b09fe959294f7a091a6ecaae91daf1cb4f5c icedtea-2.6pre05
+05fe7a87d14908eb3f21a0d29fc72cee2f996b7f jdk7u80-b00
diff -r 98fafba890cb -r 42a819ab201a .jcheck/conf
--- a/.jcheck/conf	Tue Apr 08 08:45:26 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 98fafba890cb -r 42a819ab201a agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile	Tue Apr 08 08:45:26 2014 -0700
+++ b/agent/src/os/linux/Makefile	Mon Aug 11 15:09:20 2014 +0100
@@ -23,7 +23,12 @@
 #
 
 ARCH := $(shell if ([ `uname -m` = "ia64" ])  ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
-GCC      = gcc
+
+ifndef BUILD_GCC
+BUILD_GCC = gcc
+endif
+
+GCC      = $(BUILD_GCC)
 
 JAVAH    = ${JAVA_HOME}/bin/javah
 
@@ -40,7 +45,7 @@
 
 LIBS     = -lthread_db
 
-CFLAGS   = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64
+CFLAGS   = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) -D_FILE_OFFSET_BITS=64
 
 LIBSA = $(ARCH)/libsaproc.so
 
@@ -73,7 +78,7 @@
 	$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
 
 test.o: test.c
-	$(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
+	$(GCC) -c -o test.o -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) test.c
 
 test: test.o
 	$(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
diff -r 98fafba890cb -r 42a819ab201a agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h	Tue Apr 08 08:45:26 2014 -0700
+++ b/agent/src/os/linux/libproc.h	Mon Aug 11 15:09:20 2014 +0100
@@ -34,19 +34,7 @@
 #include "libproc_md.h"
 #endif
 
-#if defined(sparc) || defined(sparcv9)
-/*
-  If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
-  otherwise it should be from /usr/include/asm-sparc
-  These two files define pt_regs structure differently
-*/
-#ifdef _LP64
-#include "asm-sparc64/ptrace.h"
-#else
-#include "asm-sparc/ptrace.h"
-#endif
-
-#endif //sparc or sparcv9
+#include <linux/ptrace.h>
 
 /************************************************************************************
 
@@ -88,7 +76,7 @@
 };
 #endif
 
-#if defined(sparc)  || defined(sparcv9)
+#if defined(sparc) || defined(sparcv9) || defined(ppc64)
 #define user_regs_struct  pt_regs
 #endif
 
diff -r 98fafba890cb -r 42a819ab201a agent/src/os/linux/ps_proc.c
--- a/agent/src/os/linux/ps_proc.c	Tue Apr 08 08:45:26 2014 -0700
+++ b/agent/src/os/linux/ps_proc.c	Mon Aug 11 15:09:20 2014 +0100
@@ -261,7 +261,7 @@
 
 static bool read_lib_info(struct ps_prochandle* ph) {
   char fname[32];
-  char buf[256];
+  char buf[PATH_MAX];
   FILE *fp = NULL;
 
   sprintf(fname, "/proc/%d/maps", ph->pid);
@@ -271,10 +271,52 @@
     return false;
   }
 
-  while(fgets_no_cr(buf, 256, fp)){
-    char * word[6];
-    int nwords = split_n_str(buf, 6, word, ' ', '\0');
-    if (nwords > 5 && find_lib(ph, word[5]) == false) {
+  while(fgets_no_cr(buf, PATH_MAX, fp)){
+    char * word[7];
+    int nwords = split_n_str(buf, 7, word, ' ', '\0');
+
+    if (nwords < 6) {
+      // not a shared library entry. ignore.
+      continue;
+    }
+
+    if (word[5][0] == '[') {
+        // not a shared library entry. ignore.
+      if (strncmp(word[5],"[stack",6) == 0) {
+        continue;
+      }
+      if (strncmp(word[5],"[heap]",6) == 0) {
+        continue;
+      }
+
+      // SA don't handle VDSO
+      if (strncmp(word[5],"[vdso]",6) == 0) {
+        continue;
+      }
+      if (strncmp(word[5],"[vsyscall]",6) == 0) {
+        continue;
+      }
+    }
+
+    if (nwords > 6) {
+      // prelink altered mapfile when the program is running.
+      // Entries like one below have to be skipped
+      //  /lib64/libc-2.15.so (deleted)
+      // SO name in entries like one below have to be stripped.
+      //  /lib64/libpthread-2.15.so.#prelink#.EECVts
+      char *s = strstr(word[5],".#prelink#");
+      if (s == NULL) {
+        // No prelink keyword. skip deleted library
+        print_debug("skip shared object %s deleted by prelink\n", word[5]);
+        continue;
+      }
+
+      // Fall through
+      print_debug("rectifing shared object name %s changed by prelink\n", word[5]);
+      *s = 0;
+    }
+
+    if (find_lib(ph, word[5]) == false) {
        intptr_t base;
        lib_info* lib;
 #ifdef _LP64
diff -r 98fafba890cb -r 42a819ab201a make/Makefile
--- a/make/Makefile	Tue Apr 08 08:45:26 2014 -0700
+++ b/make/Makefile	Mon Aug 11 15:09:20 2014 +0100
@@ -85,6 +85,7 @@
 # Typical C1/C2 targets made available with this Makefile
 C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
 C2_VM_TARGETS=product  fastdebug  optimized  jvmg
+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
 
@@ -127,6 +128,12 @@
 all_debugshark:     jvmgshark docs export_debug
 all_optimizedshark: optimizedshark docs export_optimized
 
+allcore:           all_productcore all_fastdebugcore
+all_productcore:   productcore docs export_product
+all_fastdebugcore: fastdebugcore docs export_fastdebug
+all_debugcore:     jvmgcore docs export_debug
+all_optimizedcore: optimizedcore docs export_optimized
+
 # Do everything
 world:         all create_jdk
 
@@ -151,6 +158,10 @@
 	$(CD) $(GAMMADIR)/make; \
 	$(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
 
+$(CORE_VM_TARGETS):
+	$(CD) $(GAMMADIR)/make; \
+	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
+
 $(ZERO_VM_TARGETS):
 	$(CD) $(GAMMADIR)/make; \
 	$(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
@@ -203,6 +214,12 @@
 		      $(MAKE_ARGS) $(VM_TARGET)
 endif
 
+generic_buildcore:
+	$(MKDIR) -p $(OUTPUTDIR)
+	$(CD) $(OUTPUTDIR); \
+		$(MAKE) -f $(ABS_OS_MAKEFILE) \
+			$(MAKE_ARGS) $(VM_TARGET)
+
 generic_buildzero:
 	$(MKDIR) -p $(OUTPUTDIR)
 	$(CD) $(OUTPUTDIR); \
@@ -257,10 +274,12 @@
 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
 SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
+CORE_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
+CORE_DIR=$(CORE_BASE_DIR)/$(VM_SUBDIR)
 
 ifeq ($(JVM_VARIANT_SERVER), true)
     MISC_DIR=$(C2_DIR)
@@ -278,6 +297,10 @@
     MISC_DIR=$(ZERO_DIR)
     GEN_DIR=$(ZERO_BASE_DIR)/generated
 endif
+ifeq ($(JVM_VARIANT_CORE), true)
+  MISC_DIR=$(CORE_DIR)
+  GEN_DIR=$(CORE_BASE_DIR)/generated
+endif
 
 # Bin files (windows)
 ifeq ($(OSNAME),windows)
@@ -387,6 +410,20 @@
         $(EXPORT_SERVER_DIR)/%.diz:			$(ZERO_DIR)/%.diz
 		$(install-file)
     endif
+    ifeq ($(JVM_VARIANT_CORE), true)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
+		$(install-file)
+        $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(CORE_DIR)/%.$(LIBRARY_SUFFIX)
+		$(install-file)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: 	$(CORE_DIR)/%.debuginfo
+		$(install-file)
+        $(EXPORT_SERVER_DIR)/%.debuginfo:       	$(CORE_DIR)/%.debuginfo
+		$(install-file)
+        $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: 		$(CORE_DIR)/%.diz
+		$(install-file)
+        $(EXPORT_SERVER_DIR)/%.diz:       		$(CORE_DIR)/%.diz
+		$(install-file)
+    endif
 endif
 
 # Jar file (sa-jdi.jar)
diff -r 98fafba890cb -r 42a819ab201a make/aix/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/aix/Makefile	Mon Aug 11 15:09:20 2014 +0100
@@ -0,0 +1,380 @@
+#
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2012, 2013 SAP AG. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+# This makefile creates a build tree and lights off a build.
+# You can go back into the build tree and perform rebuilds or
+# incremental builds as desired. Be sure to reestablish
+# environment variable settings for LD_LIBRARY_PATH and JAVA_HOME.
+
+# The make process now relies on java and javac. These can be
+# specified either implicitly on the PATH, by setting the
+# (JDK-inherited) ALT_BOOTDIR environment variable to full path to a
+# JDK in which bin/java and bin/javac are present and working (e.g.,
+# /usr/local/java/jdk1.3/solaris), or via the (JDK-inherited)
+# default BOOTDIR path value. Note that one of ALT_BOOTDIR
+# or BOOTDIR has to be set. We do *not* search javac, javah, rmic etc.
+# from the PATH.
+#
+# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
+# an architecture that differs from the target architecture, as long
+# as the bootstrap jdk runs under the same flavor of OS as the target
+# (i.e., if the target is linux, point to a jdk that runs on a linux
+# box).  In order to use such a bootstrap jdk, set the make variable
+# REMOTE to the desired remote command mechanism, e.g.,
+#
+#    make REMOTE="rsh -l me myotherlinuxbox"
+
+# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding.
+# JDI binding on SA produces two binaries:
+#  1. sa-jdi.jar       - This is build before building libjvm[_g].so
+#                        Please refer to ./makefiles/sa.make
+#  2. libsa[_g].so     - Native library for SA - This is built after
+#                        libjsig[_g].so (signal interposition library)
+#                        Please refer to ./makefiles/vm.make
+# If $(GAMMADIR)/agent dir is not present, SA components are not built.
+
+ifeq ($(GAMMADIR),)
+include ../../make/defs.make
+else
+include $(GAMMADIR)/make/defs.make
+endif
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
+
+ifndef CC_INTERP
+  ifndef FORCE_TIERED
+    FORCE_TIERED=1
+  endif
+endif
+# C1 is not ported on ppc64, so we cannot build a tiered VM:
+ifeq ($(ARCH),ppc64))
+  FORCE_TIERED=0
+endif
+
+ifdef LP64
+  ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
+    _JUNK_ := $(shell echo >&2 \
+       $(OSNAME) $(ARCH) "*** ERROR: this platform does not support 64-bit compilers!")
+	@exit 1
+  endif
+endif
+
+# we need to set up LP64 correctly to satisfy sanity checks in adlc
+ifneq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
+  MFLAGS += " LP64=1 "
+endif
+
+# pass USE_SUNCC further, through MFLAGS
+ifdef USE_SUNCC
+  MFLAGS += " USE_SUNCC=1 "
+endif
+
+# The following renders pathnames in generated Makefiles valid on
+# machines other than the machine containing the build tree.
+#
+# For example, let's say my build tree lives on /files12 on
+# exact.east.sun.com.  This logic will cause GAMMADIR to begin with
+# /net/exact/files12/...
+#
+# We only do this on SunOS variants, for a couple of reasons:
+#  * It is extremely rare that source trees exist on other systems
+#  * It has been claimed that the Linux automounter is flakey, so


More information about the distro-pkg-dev mailing list