/hg/release/icedtea7-forest-2.4/hotspot: 51 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 24 13:33:46 PDT 2013
changeset 8c0bb41c24b2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8c0bb41c24b2
author: katleman
date: Thu Jun 27 13:58:29 2013 -0700
Added tag jdk7u40-b31 for changeset 645b68762a36
changeset 0125094eb636 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0125094eb636
author: amurillo
date: Fri Jun 21 18:55:50 2013 -0700
8017252: new hotspot build - hs24-b51
Reviewed-by: jcoomes
changeset 707635752c58 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=707635752c58
author: ehelin
date: Sat Jun 22 10:42:14 2013 +0200
8016734: Remove extra code due to duplicated push
Reviewed-by: brutisso, tschatzl
changeset 913ce96aaa86 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=913ce96aaa86
author: ehelin
date: Sat Jun 22 14:16:32 2013 +0200
Merge
changeset c0643ff8feb5 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c0643ff8feb5
author: adlertz
date: Fri Jun 14 01:19:56 2013 +0200
8016157: During CTW: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block
Summary: Disable rematerialization for negD node
Reviewed-by: kvn, roland
changeset 76e9dce17c31 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=76e9dce17c31
author: johnc
date: Mon Jun 24 10:40:10 2013 -0700
8015237: Parallelize string table scanning during strong root processing
Summary: Parallelize the scanning of the intern string table by having each GC worker claim a given number of buckets. Changes were also reviewed by Per Liden <per.liden at oracle.com>.
Reviewed-by: tschatzl, stefank, twisti
changeset 7c945fe9f388 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7c945fe9f388
author: johnc
date: Mon Jun 24 10:45:58 2013 -0700
Merge
changeset b986e7953c87 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b986e7953c87
author: johnc
date: Mon Jun 24 14:27:22 2013 -0700
Merge
changeset 7dd0c5a45d07 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7dd0c5a45d07
author: tschatzl
date: Tue Jun 25 09:55:01 2013 +0200
8016740: assert in GC_locker from PSOldGen::expand with -XX:+PrintGCDetails and Verbose
Summary: Use GC_locker::is_active_and_needs_gc() instead of GC_locker::is_active() for providing information about the reason of heap expansion.
Reviewed-by: johnc, tamao
changeset 3500f22d989d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3500f22d989d
author: morris
date: Tue Jun 25 11:32:33 2013 -0700
8013546: compiler/8011901/Test8011901.java fails with CompilationError: Compilation failed
Summary: Remove JDK8 specific test
Reviewed-by: kvn
changeset 1122b46889b9 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1122b46889b9
author: adlertz
date: Wed Jun 26 00:40:13 2013 +0200
8017510: Add a regression test for 8005956
Summary: Regression test for 8005956
Reviewed-by: kvn, twisti
changeset 8805ca77133d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8805ca77133d
author: egahlin
date: Wed Jun 26 17:02:04 2013 +0200
8016331: Minor issues in event tracing metadata
Reviewed-by: stefank, brutisso, mgronlun
changeset 43f92d82c553 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=43f92d82c553
author: mgronlun
date: Wed Jun 26 17:48:12 2013 +0200
Merge
changeset c1130faa6248 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c1130faa6248
author: adlertz
date: Mon Jun 24 07:28:54 2013 +0200
8001345: VM crashes with assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
Summary: Remove unnecessary LoadN / DecodeN nodes at MemBarAcquire nodes.
Reviewed-by: kvn, roland
changeset f460d2390c02 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f460d2390c02
author: kvn
date: Wed Jun 26 12:52:52 2013 -0700
Merge
changeset dcb233d6bfad in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dcb233d6bfad
author: brutisso
date: Wed Jun 26 13:09:02 2013 +0200
8013791: G1: G1CollectorPolicy::initialize_flags() may set min_alignment > max_alignment
Summary: Make sure max alignemnt is at least as large as min alignment
Reviewed-by: johnc, jmasa, tschatzl
changeset 785a9733f507 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=785a9733f507
author: brutisso
date: Wed Jun 26 04:20:25 2013 -0700
Merge
changeset a6a52b788186 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a6a52b788186
author: brutisso
date: Wed Jun 26 16:05:29 2013 -0700
Merge
changeset 91f2a56579c2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=91f2a56579c2
author: zgu
date: Tue Jun 25 17:22:04 2013 -0400
8017478: Kitchensink crashed with SIGSEGV in BaselineReporter::diff_callsites
Summary: Fixed possible NULL pointer that caused SIGSEGV
Reviewed-by: coleenp, acorn, ctornqvi
changeset b1e9bbeb81f3 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b1e9bbeb81f3
author: zgu
date: Wed Jun 26 20:21:16 2013 -0700
Merge
changeset ad5bb04f36f5 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ad5bb04f36f5
author: kvn
date: Fri May 31 13:54:47 2013 -0700
8015441: runThese crashed with assert(opcode == Op_ConP || opcode == Op_ThreadLocal || opcode == Op_CastX2P ..) failed: sanity
Summary: Relax the assert to accept any raw ptr types.
Reviewed-by: roland
changeset 2417fa1acf2b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2417fa1acf2b
author: amurillo
date: Fri Jun 28 00:44:12 2013 -0700
Merge
changeset 9658c969b7cf in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9658c969b7cf
author: amurillo
date: Fri Jun 28 00:44:13 2013 -0700
Added tag hs24-b51 for changeset 2417fa1acf2b
changeset 67131c21181a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=67131c21181a
author: katleman
date: Wed Jul 03 16:36:28 2013 -0700
Added tag jdk7u40-b32 for changeset 9658c969b7cf
changeset 4ebc4781f877 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4ebc4781f877
author: amurillo
date: Fri Jun 28 00:52:15 2013 -0700
8019298: new hotspot build - hs24-b52
Reviewed-by: jcoomes
changeset 973c3ede4866 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=973c3ede4866
author: brutisso
date: Thu Jun 27 09:59:59 2013 +0200
8017483: G1 tests fail with native OOME on Solaris x86 after HeapBaseMinAddress has been increased
Summary: Set HeapBaseMinAddress as default rather than ergo
Reviewed-by: stefank, jmasa, kvn
changeset 1dad4752d5f7 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1dad4752d5f7
author: brutisso
date: Fri Jun 28 14:25:25 2013 +0200
Merge
changeset 12019d9953a8 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=12019d9953a8
author: brutisso
date: Sat Jun 29 01:23:27 2013 +0200
Merge
changeset 9a72ee84e61b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9a72ee84e61b
author: tamao
date: Tue Jul 02 15:08:27 2013 -0700
7122222: GC log is limited to 2G for 32-bit
Summary: Manual backport to hsx24 from hsx25: Enable large file support for generated 32-bit ostream.o on Linux and Solaris (as only the two need this) by setting -D_FILE_OFFSET_BITS=64 in compilation
Reviewed-by: dcubed, jcoomes
changeset b68a2c45f554 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b68a2c45f554
author: johnc
date: Mon Jul 01 09:30:23 2013 -0700
8017070: G1: assert(_card_counts[card_num] <= G1ConcRSHotCardLimit) failed
Summary: The assert is invalid when a card is being refined by two different threads and its count crosses the hot threshold - the refinement count will be updated once by each thread triggering the assert. Remove the assert and update the count using a bounded expression.
Reviewed-by: jmasa, tamao, brutisso
changeset 15706a73a506 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=15706a73a506
author: amurillo
date: Thu Jul 04 03:19:49 2013 -0700
Merge
changeset 0b9149d22ee0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0b9149d22ee0
author: amurillo
date: Thu Jul 04 03:19:50 2013 -0700
Added tag hs24-b52 for changeset 15706a73a506
changeset 23eed087177a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=23eed087177a
author: katleman
date: Wed Jul 10 13:48:49 2013 -0700
Added tag jdk7u40-b33 for changeset 0b9149d22ee0
changeset b29fc5f70d65 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b29fc5f70d65
author: amurillo
date: Thu Jul 04 03:38:59 2013 -0700
8019933: new hotspot build - hs24-b53
Reviewed-by: jcoomes
changeset dd7d57bcd749 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dd7d57bcd749
author: ehelin
date: Tue Jul 09 10:03:28 2013 +0200
8017588: SA: jstack -l throws UnalignedAddressException while attaching to core file for java that was started with CMS GC
Reviewed-by: allwin, jiangli, tschatzl, dholmes
changeset 1478a623482d in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1478a623482d
author: zgu
date: Thu Jul 04 06:24:08 2013 -0400
8016074: NMT: assertion failed: assert(thread->thread_state() == from) failed: coming from wrong thread state
Summary: Uses os::NakedYield() on Solaris instead of os::yield_all()
Reviewed-by: acorn, coleenp, hseigel
changeset 1331bffeb46e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1331bffeb46e
author: adlertz
date: Tue Jul 09 17:20:32 2013 +0200
8019625: Test compiler/8005956/PolynomialRoot.java timeouts on Solaris SPARCs
Summary: Disable the test for SPARC and reduce the number of test iterations
Reviewed-by: kvn
changeset 25a649574b3b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=25a649574b3b
author: kvn
date: Tue Jul 09 17:45:10 2013 -0700
Merge
changeset c4a8806c0302 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c4a8806c0302
author: dholmes
date: Tue Jul 09 21:05:44 2013 -0400
8012144: multiple SIGSEGVs fails on staxf
Summary: Missing fence in taskQueue lock-free code on some platforms
Reviewed-by: dholmes, kvn, shade, johnc, goetz
Contributed-by: Axel Siebenborn <axel.siebenborn at sap.com>
changeset 0d7106aa7e08 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=0d7106aa7e08
author: dholmes
date: Tue Jul 09 21:16:38 2013 -0400
Merge
changeset fc4858327ae8 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fc4858327ae8
author: dholmes
date: Wed Jul 10 00:15:41 2013 -0400
Merge
changeset 7bfdc3edfe1a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=7bfdc3edfe1a
author: jprovino
date: Fri Jul 05 10:18:53 2013 -0400
8011064: Some tests have failed with SIGSEGV on arm-hflt on build b82
Summary: NMT_detail doesn't work on ARM because of missing frame pointers.
Reviewed-by: dholmes, zgu
changeset 3a41a31ecbd7 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3a41a31ecbd7
author: vladidan
date: Tue Jul 09 14:10:33 2013 -0400
Merge
changeset f4d7fb7ba02e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f4d7fb7ba02e
author: vladidan
date: Tue Jul 09 16:49:37 2013 -0400
Merge
changeset c30107a847a3 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c30107a847a3
author: vladidan
date: Wed Jul 10 10:24:00 2013 -0400
Merge
changeset 6fa8cb2866c0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=6fa8cb2866c0
author: dcubed
date: Wed Jul 10 13:42:15 2013 -0700
8015884: runThese crashed with SIGSEGV, hs_err has an error instead of stacktrace
Summary: Dl_info struct should only be used if dladdr() has returned non-zero (no errors) and always check the dladdr() return value; Dl_info.dli_sname and Dl_info.dli_saddr fields should only be used if non-NULL; update/improve runtime/6888954/vmerrors.sh test
Reviewed-by: dsamersoff, zgu, hseigel, coleenp
changeset c0b13febbf45 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=c0b13febbf45
author: zgu
date: Tue Jul 09 13:18:16 2013 -0400
8011760: assert(delta != 0) failed: dup pointer in MemBaseline::malloc_sort_by_addr
Summary: Some of qsort implementation on Linux x86 compares element to itself, which is mistakenly treated as duplicate pointer
Reviewed-by: dcubed, acorn
changeset cd8439e6d2d6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=cd8439e6d2d6
author: zgu
date: Thu Jul 11 04:47:12 2013 +0200
Merge
changeset 1118c5d38ac0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1118c5d38ac0
author: amurillo
date: Thu Jul 11 06:25:24 2013 -0700
Merge
changeset 1274c4750118 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=1274c4750118
author: amurillo
date: Thu Jul 11 06:25:25 2013 -0700
Added tag hs24-b53 for changeset 1118c5d38ac0
changeset 71498f89324b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=71498f89324b
author: andrew
date: Wed Jul 24 21:31:53 2013 +0100
Merge jdk7u40-b34
diffstat:
.hgtags | 16 +
.jcheck/conf | 2 -
agent/src/os/linux/Makefile | 11 +-
agent/src/os/linux/libproc.h | 29 +-
agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java | 30 +-
make/hotspot_version | 2 +-
make/linux/makefiles/adlc.make | 2 +
make/linux/makefiles/buildtree.make | 2 +
make/linux/makefiles/defs.make | 52 +-
make/linux/makefiles/gcc.make | 30 +-
make/linux/makefiles/jsig.make | 6 +-
make/linux/makefiles/rules.make | 10 -
make/linux/makefiles/saproc.make | 6 +-
make/linux/makefiles/vm.make | 66 +-
make/linux/makefiles/zero.make | 4 +
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 | 17 +
make/windows/makefiles/vm.make | 8 +
src/cpu/x86/vm/c2_globals_x86.hpp | 2 +-
src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +-
src/os/bsd/vm/os_bsd.cpp | 195 +-
src/os/linux/vm/os_linux.cpp | 125 +-
src/os/solaris/vm/os_solaris.cpp | 227 +-
src/os/solaris/vm/os_solaris.inline.hpp | 6 +-
src/os/windows/vm/os_windows.cpp | 49 +-
src/os/windows/vm/os_windows.hpp | 6 +-
src/os/windows/vm/os_windows.inline.hpp | 8 +-
src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +-
src/share/vm/adlc/formssel.cpp | 9 +
src/share/vm/adlc/formssel.hpp | 1 +
src/share/vm/asm/codeBuffer.hpp | 2 +-
src/share/vm/ci/ciTypeFlow.cpp | 2 +-
src/share/vm/classfile/symbolTable.cpp | 39 +-
src/share/vm/classfile/symbolTable.hpp | 17 +-
src/share/vm/classfile/systemDictionary.cpp | 1 -
src/share/vm/compiler/methodLiveness.cpp | 12 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 10 +-
src/share/vm/gc_implementation/g1/g1CardCounts.cpp | 7 +-
src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp | 3 +-
src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +-
src/share/vm/memory/collectorPolicy.cpp | 12 +-
src/share/vm/memory/sharedHeap.cpp | 25 +-
src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +-
src/share/vm/oops/instanceKlass.hpp | 17 +-
src/share/vm/opto/escape.cpp | 2 +-
src/share/vm/opto/memnode.cpp | 21 +-
src/share/vm/prims/jni.cpp | 18 +-
src/share/vm/prims/jvmtiEnv.cpp | 3 +
src/share/vm/runtime/arguments.cpp | 13 +-
src/share/vm/runtime/globals.hpp | 2 +-
src/share/vm/runtime/os.cpp | 3 +
src/share/vm/runtime/os.hpp | 10 +-
src/share/vm/runtime/vmStructs.cpp | 1 +
src/share/vm/services/memBaseline.cpp | 2 +-
src/share/vm/services/memReporter.cpp | 46 +-
src/share/vm/services/memTracker.cpp | 11 +-
src/share/vm/services/memTracker.hpp | 14 +
src/share/vm/shark/sharkCompiler.cpp | 4 +-
src/share/vm/trace/trace.dtd | 3 -
src/share/vm/trace/trace.xml | 12 +-
src/share/vm/trace/traceEventClasses.xsl | 2 +-
src/share/vm/trace/traceEventIds.xsl | 2 +-
src/share/vm/trace/traceTypes.xsl | 2 +-
src/share/vm/utilities/bitMap.hpp | 2 +-
src/share/vm/utilities/debug.cpp | 19 +-
src/share/vm/utilities/debug.hpp | 4 +-
src/share/vm/utilities/globalDefinitions.hpp | 8 +
src/share/vm/utilities/ostream.cpp | 2 +-
src/share/vm/utilities/taskqueue.hpp | 11 +-
src/share/vm/utilities/vmError.cpp | 10 +-
test/compiler/8005956/PolynomialRoot.java | 783 ++++++++++
test/compiler/8011901/Test8011901.java | 68 -
test/gc/g1/TestRegionAlignment.java | 36 +
test/runtime/6888954/vmerrors.sh | 23 +-
test/runtime/7020373/GenOOMCrashClass.java | 157 ++
test/runtime/7020373/Test7020373.sh | 4 +
test/runtime/7020373/testcase.jar | Bin
85 files changed, 1910 insertions(+), 527 deletions(-)
diffs (truncated from 4171 to 500 lines):
diff -r 645b68762a36 -r 71498f89324b .hgtags
--- a/.hgtags Fri Jun 21 18:46:08 2013 -0700
+++ b/.hgtags Wed Jul 24 21:31:53 2013 +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
@@ -311,6 +317,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 +447,7 @@
4f7ad6299356bfd2cfb448ea4c11e8ce0fbf69f4 jdk7u12-b07
3bb803664f3d9c831d094cbe22b4ee5757e780c8 jdk7u12-b08
92e382c3cccc0afbc7f72fccea4f996e05b66b3e jdk7u12-b09
+6e4feb17117d21e0e4360f2d0fbc68397ed3ba80 icedtea-2.4-branchpoint
7554f9b2bcc72204ac10ba8b08b8e648459504df hs24-b29
181528fd1e74863a902f171a2ad46270a2fb15e0 jdk7u14-b10
4008cf63c30133f2fac148a39903552fe7a33cea hs24-b30
@@ -489,6 +497,7 @@
c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20
d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39
3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40
+ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0
3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21
d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41
aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22
@@ -509,3 +518,10 @@
88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49
24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30
41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50
+5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1
+645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31
+2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51
+9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32
+15706a73a506943059a6bbf59e2ec8866a026114 hs24-b52
+0b9149d22ee08fe13b4f198ff258a1348e27b8b2 jdk7u40-b33
+1118c5d38ac0693d98f913485ceb3c57366cfbab hs24-b53
diff -r 645b68762a36 -r 71498f89324b .jcheck/conf
--- a/.jcheck/conf Fri Jun 21 18:46:08 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 645b68762a36 -r 71498f89324b agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile Fri Jun 21 18:46:08 2013 -0700
+++ b/agent/src/os/linux/Makefile Wed Jul 24 21:31:53 2013 +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 645b68762a36 -r 71498f89324b agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h Fri Jun 21 18:46:08 2013 -0700
+++ b/agent/src/os/linux/libproc.h Wed Jul 24 21:31:53 2013 +0100
@@ -41,9 +41,34 @@
These two files define pt_regs structure differently
*/
#ifdef _LP64
-#include "asm-sparc64/ptrace.h"
+struct pt_regs {
+ unsigned long u_regs[16]; /* globals and ins */
+ unsigned long tstate;
+ unsigned long tpc;
+ unsigned long tnpc;
+ unsigned int y;
+
+ /* We encode a magic number, PT_REGS_MAGIC, along
+ * with the %tt (trap type) register value at trap
+ * entry time. The magic number allows us to identify
+ * accurately a trap stack frame in the stack
+ * unwinder, and the %tt value allows us to test
+ * things like "in a system call" etc. for an arbitray
+ * process.
+ *
+ * The PT_REGS_MAGIC is chosen such that it can be
+ * loaded completely using just a sethi instruction.
+ */
+ unsigned int magic;
+};
#else
-#include "asm-sparc/ptrace.h"
+struct pt_regs {
+ unsigned long psr;
+ unsigned long pc;
+ unsigned long npc;
+ unsigned long y;
+ unsigned long u_regs[16]; /* globals and ins */
+};
#endif
#endif //sparc or sparcv9
diff -r 645b68762a36 -r 71498f89324b agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
--- a/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Fri Jun 21 18:46:08 2013 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java Wed Jul 24 21:31:53 2013 +0100
@@ -89,6 +89,7 @@
genericSignature = type.getAddressField("_generic_signature");
majorVersion = new CIntField(type.getCIntegerField("_major_version"), Oop.getHeaderSize());
minorVersion = new CIntField(type.getCIntegerField("_minor_version"), Oop.getHeaderSize());
+ miscFlags = new CIntField(type.getCIntegerField("_misc_flags"), Oop.getHeaderSize());
headerSize = alignObjectOffset(Oop.getHeaderSize() + type.getSize());
// read field offset constants
@@ -147,6 +148,16 @@
private static AddressField genericSignature;
private static CIntField majorVersion;
private static CIntField minorVersion;
+ private static CIntField miscFlags;
+
+ private static final long MISC_REWRITTEN = 1 << 0; // methods rewritten.
+ private static final long MISC_HAS_NONSTATIC_FIELDS = 1 << 1; // for sizing with UseCompressedOops
+ private static final long MISC_SHOULD_VERIFY_CLASS = 1 << 1; // allow caching of preverification
+ private static final long MISC_IS_ANONYMOUS = 1 << 3; // has embedded _inner_classes field
+
+ public boolean isAnonymous() {
+ return (miscFlags.getValue(this) & MISC_IS_ANONYMOUS) != 0;
+ }
// type safe enum for ClassState from instanceKlass.hpp
public static class ClassState {
@@ -799,9 +810,22 @@
public long getObjectSize() {
- long bodySize = alignObjectOffset(getVtableLen() * getHeap().getOopSize())
- + alignObjectOffset(getItableLen() * getHeap().getOopSize())
- + (getNonstaticOopMapSize()) * getHeap().getOopSize();
+ final long oopSize = getHeap().getOopSize();
+
+ long vtableSize = alignObjectOffset(getVtableLen() * oopSize);
+ long itableSize = alignObjectOffset(getItableLen() * oopSize);
+
+ long nonStaticOopMapSizeBytes = getNonstaticOopMapSize() * oopSize;
+ long alignedNonStaticOopMapSize = isInterface() || isAnonymous() ?
+ alignObjectOffset(nonStaticOopMapSizeBytes) :
+ nonStaticOopMapSizeBytes;
+
+ long interfaceImplementorSize = isInterface() ? oopSize : 0;
+ long hostKlassSize = isAnonymous() ? oopSize : 0;
+
+ long bodySize = vtableSize + itableSize + nonStaticOopMapSizeBytes +
+ interfaceImplementorSize + hostKlassSize;
+
return alignObjectSize(headerSize + bodySize);
}
diff -r 645b68762a36 -r 71498f89324b make/hotspot_version
--- a/make/hotspot_version Fri Jun 21 18:46:08 2013 -0700
+++ b/make/hotspot_version Wed Jul 24 21:31:53 2013 +0100
@@ -35,7 +35,7 @@
HS_MAJOR_VER=24
HS_MINOR_VER=0
-HS_BUILD_NUMBER=50
+HS_BUILD_NUMBER=53
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/adlc.make
--- a/make/linux/makefiles/adlc.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/adlc.make Wed Jul 24 21:31:53 2013 +0100
@@ -68,7 +68,9 @@
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
CFLAGS_WARN = -Werror
+endif
CFLAGS += $(CFLAGS_WARN)
OBJECTNAMES = \
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/buildtree.make Wed Jul 24 21:31:53 2013 +0100
@@ -57,6 +57,7 @@
# having to read the dependency files for the vm.
-include $(SPEC)
+include $(GAMMADIR)/make/defs.make
include $(GAMMADIR)/make/scm.make
include $(GAMMADIR)/make/altsrc.make
@@ -194,6 +195,7 @@
$(BUILDTREE_COMMENT); \
echo; \
echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
+ echo "JVM_VARIANTS = $(JVM_VARIANTS)"; \
sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
echo; \
echo "GAMMADIR = $(GAMMADIR)"; \
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/defs.make Wed Jul 24 21:31:53 2013 +0100
@@ -242,10 +242,14 @@
# client and server subdirectories have symbolic links to ../libjsig.so
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
- else
- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ ifneq ($(ZERO_BUILD), true)
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz
+ else
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ endif
+ endif
endif
endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
@@ -254,11 +258,13 @@
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
- else
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz
+ else
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ endif
endif
endif
endif
@@ -266,11 +272,13 @@
ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
- else
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
+ else
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ endif
endif
endif
endif
@@ -282,12 +290,16 @@
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
- else
- ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
- ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ ifneq ($(ZERO_BUILD), true)
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
+ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
+ else
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ endif
+ endif
endif
endif
ADD_SA_BINARIES/ppc =
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/gcc.make Wed Jul 24 21:31:53 2013 +0100
@@ -30,22 +30,21 @@
# When cross-compiling the ALT_COMPILER_PATH points
# to the cross-compilation toolset
ifdef CROSS_COMPILE_ARCH
- CXX = $(ALT_COMPILER_PATH)/g++
- CC = $(ALT_COMPILER_PATH)/gcc
- HOSTCXX = g++
- HOSTCC = gcc
- STRIP = $(ALT_COMPILER_PATH)/strip
+ CXX ?= $(ALT_COMPILER_PATH)/g++
+ CC ?= $(ALT_COMPILER_PATH)/gcc
+ HOSTCXX ?= g++
+ HOSTCC ?= gcc
+ STRIP ?= $(ALT_COMPILER_PATH)/strip
else
- CXX = g++
- CC = gcc
- HOSTCXX = $(CXX)
- HOSTCC = $(CC)
- STRIP = strip
+ CXX ?= g++
+ CC ?= gcc
+ HOSTCXX ?= $(CXX)
+ HOSTCC ?= $(CC)
+ STRIP ?= strip
endif
AS = $(CC) -c
endif
-
# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
# prints the numbers (e.g. "2.95", "3.2.1")
CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
@@ -66,15 +65,16 @@
# Compiler flags
# position-independent code
+ifneq ($(filter parisc ppc ppc64 s390 s390x sparc sparc64 sparcv9,$(ZERO_LIBARCH)),)
PICFLAG = -fPIC
+else
+PICFLAG = -fpic
+endif
VM_PICFLAG/LIBJVM = $(PICFLAG)
VM_PICFLAG/AOUT =
VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-ifeq ($(JVM_VARIANT_ZERO), true)
-CFLAGS += $(LIBFFI_CFLAGS)
-endif
ifeq ($(JVM_VARIANT_ZEROSHARK), true)
CFLAGS += $(LIBFFI_CFLAGS)
CFLAGS += $(LLVM_CFLAGS)
@@ -129,7 +129,9 @@
endif
# Compiler warnings are treated as errors
+ifneq ($(COMPILER_WARNINGS_FATAL),false)
WARNINGS_ARE_ERRORS = -Werror
+endif
# Except for a few acceptable ones
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/jsig.make
--- a/make/linux/makefiles/jsig.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/jsig.make Wed Jul 24 21:31:53 2013 +0100
@@ -62,8 +62,10 @@
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -73,10 +75,12 @@
endif
endif
[ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); }
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ifneq ($(STRIP_POLICY),no_strip)
+ ifeq ($(ZIP_DEBUGINFO_FILES),1)
$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
$(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO)
[ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); }
+ endif
endif
endif
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/rules.make
--- a/make/linux/makefiles/rules.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/rules.make Wed Jul 24 21:31:53 2013 +0100
@@ -143,20 +143,10 @@
include $(GAMMADIR)/make/altsrc.make
-# The non-PIC object files are only generated for 32 bit platforms.
-ifdef LP64
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
-else
-%.o: %.cpp
- @echo Compiling $<
- $(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
- $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
- $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
-endif
%.o: %.s
@echo Assembling $<
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/saproc.make
--- a/make/linux/makefiles/saproc.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/saproc.make Wed Jul 24 21:31:53 2013 +0100
@@ -101,8 +101,11 @@
-lthread_db
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+ [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); }
+ endif
ifeq ($(STRIP_POLICY),all_strip)
$(QUIETLY) $(STRIP) $@
else
@@ -111,11 +114,12 @@
# implied else here is no stripping at all
endif
endif
- [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); }
ifeq ($(ZIP_DEBUGINFO_FILES),1)
+ ifneq ($(STRIP_POLICY),no_strip)
$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO)
$(RM) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO)
[ -f $(LIBSAPROC_G_DIZ) ] || { ln -s $(LIBSAPROC_DIZ) $(LIBSAPROC_G_DIZ); }
+ endif
endif
endif
diff -r 645b68762a36 -r 71498f89324b make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make Fri Jun 21 18:46:08 2013 -0700
+++ b/make/linux/makefiles/vm.make Wed Jul 24 21:31:53 2013 +0100
@@ -97,15 +97,28 @@
${HS_LIB_ARCH} \
More information about the distro-pkg-dev
mailing list