/hg/release/icedtea7-forest-2.4/hotspot: 47 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Apr 16 18:42:35 UTC 2014
changeset 208dbfe8ac03 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=208dbfe8ac03
author: katleman
date: Fri Dec 20 18:52:58 2013 -0800
Added tag jdk7u51-b31 for changeset cf4110c35afb
changeset 90931375569a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=90931375569a
author: katleman
date: Thu Dec 26 13:04:57 2013 -0800
Added tag jdk7u51-b30 for changeset a398ddc79d23
changeset f8a1ba5693e9 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f8a1ba5693e9
author: asaha
date: Tue Dec 31 08:56:11 2013 -0800
Merge
changeset e2c008218d66 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=e2c008218d66
author: asaha
date: Wed Oct 23 13:53:41 2013 -0700
8027196: Increment minor version of HSx for 7u55 and initialize the build number
Reviewed-by: jcoomes
changeset 10848efaae50 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=10848efaae50
author: asaha
date: Tue Oct 29 09:53:41 2013 -0700
Merge
changeset 291ce272b61e in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=291ce272b61e
author: aeriksso
date: Thu Oct 31 16:49:53 2013 +0100
8026887: Make issues due to failed large pages allocations easier to debug
Reviewed-by: stefank, mcastegr, poonam
changeset db1734313388 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=db1734313388
author: asaha
date: Tue Nov 05 12:03:32 2013 -0800
Merge
changeset be6a1b65ba06 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=be6a1b65ba06
author: asaha
date: Tue Nov 12 09:11:14 2013 -0800
Merge
changeset 5a869822ce57 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=5a869822ce57
author: asaha
date: Tue Nov 19 09:32:43 2013 -0800
Merge
changeset 67c54d2ad34c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=67c54d2ad34c
author: asaha
date: Wed Nov 27 11:19:05 2013 -0800
Merge
changeset fb0e151fb1c6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fb0e151fb1c6
author: asaha
date: Wed Dec 04 12:37:34 2013 -0800
Merge
changeset a863ae5351d9 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=a863ae5351d9
author: jrose
date: Thu Dec 05 14:38:53 2013 -0800
8029507: Enhance JVM method processing
8029533: REGRESSION: closed/java/lang/invoke/8008140/Test8008140.java fails against JPRT PIT 17891982 build
8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms
Summary: update MemberName.clazz correctly in MemberName.resolve; also pass lookupClass to MethodHandles::resolve_MemberName
Reviewed-by: acorn, vlivanov
changeset 496f7585f7d0 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=496f7585f7d0
author: asaha
date: Tue Dec 10 17:15:13 2013 -0800
Merge
changeset dd90f1ad1fe8 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dd90f1ad1fe8
author: asaha
date: Mon Dec 16 12:12:41 2013 -0800
Added tag jdk7u55-b00 for changeset dee2a38ef6b2
changeset ac0063b4452b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ac0063b4452b
author: asaha
date: Mon Dec 16 13:04:36 2013 -0800
Merge
changeset 2f09c332de9b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2f09c332de9b
author: asaha
date: Mon Dec 16 14:53:36 2013 -0800
Added tag jdk7u55-b01 for changeset ac0063b4452b
changeset ea287a90718f in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ea287a90718f
author: asaha
date: Mon Dec 16 18:49:35 2013 -0800
Merge
changeset 89b9bdf85398 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=89b9bdf85398
author: asaha
date: Fri Dec 20 11:47:26 2013 -0800
Merge
changeset f1a5b7cc078f in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f1a5b7cc078f
author: asaha
date: Fri Dec 20 14:13:38 2013 -0800
Merge
changeset 408028d410e3 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=408028d410e3
author: asaha
date: Fri Dec 20 21:30:47 2013 -0800
Merge
changeset f80814d92860 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f80814d92860
author: katleman
date: Tue Dec 24 14:45:55 2013 -0800
Added tag jdk7u55-b02 for changeset 408028d410e3
changeset 50fb91504dd8 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=50fb91504dd8
author: asaha
date: Thu Dec 26 15:50:54 2013 -0800
Merge
changeset ff8e01218d6c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ff8e01218d6c
author: katleman
date: Mon Jan 06 13:56:54 2014 -0800
Added tag jdk7u55-b03 for changeset 50fb91504dd8
changeset 619b904e420a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=619b904e420a
author: katleman
date: Wed Jan 08 13:23:53 2014 -0800
Added tag jdk7u45-b35 for changeset 12ea8d416f10
changeset 208419914859 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=208419914859
author: asaha
date: Wed Jan 08 14:13:12 2014 -0800
Merge
changeset 46236fe5d1fe in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=46236fe5d1fe
author: asaha
date: Thu Jan 09 07:55:58 2014 -0800
Merge
changeset 3be3b8a032a5 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=3be3b8a032a5
author: dsimms
date: Fri Jan 10 15:38:30 2014 +0100
8029858: Enhance array copies
Summary: Just read the source element once
Reviewed-by: coleenp, ahgross
changeset fa17e3e38bb2 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=fa17e3e38bb2
author: katleman
date: Mon Jan 13 16:14:38 2014 -0800
Added tag jdk7u55-b04 for changeset 3be3b8a032a5
changeset b86119fa2748 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b86119fa2748
author: kvn
date: Mon Nov 11 11:53:33 2013 -0800
8024830: SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
Summary: Exclude last input argument's stack slots from vector's spilling masks.
Reviewed-by: iveresov
changeset 260d919d52e5 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=260d919d52e5
author: katleman
date: Wed Jan 22 10:06:30 2014 -0800
Added tag jdk7u55-b05 for changeset b86119fa2748
changeset 8cf6e0a3a065 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8cf6e0a3a065
author: katleman
date: Tue Jan 28 11:49:28 2014 -0800
Added tag jdk7u55-b06 for changeset 260d919d52e5
changeset 049fd2cef85b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=049fd2cef85b
author: katleman
date: Tue Feb 04 13:11:50 2014 -0800
Added tag jdk7u55-b07 for changeset 8cf6e0a3a065
changeset bb5f0b751dcf in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bb5f0b751dcf
author: katleman
date: Tue Feb 11 13:11:16 2014 -0800
Added tag jdk7u55-b08 for changeset 049fd2cef85b
changeset 9b238ab164e6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=9b238ab164e6
author: miroslawzn
date: Thu Jan 30 10:50:11 2014 -0800
8022452: Hotspot needs to know about Windows 8.1 and Windows Server 2012 R2
Reviewed-by: coleenp, ctornqvi
changeset 573d8d080af9 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=573d8d080af9
author: katleman
date: Tue Feb 18 12:41:17 2014 -0800
Added tag jdk7u55-b09 for changeset 9b238ab164e6
changeset 36f8bd4dd467 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=36f8bd4dd467
author: katleman
date: Tue Feb 18 13:36:09 2014 -0800
Added tag jdk7u55-b09 for changeset 573d8d080af9
changeset 4adb2ebfcf54 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4adb2ebfcf54
author: katleman
date: Tue Feb 25 12:20:03 2014 -0800
Added tag jdk7u55-b10 for changeset 36f8bd4dd467
changeset bc52bce9e569 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bc52bce9e569
author: asaha
date: Mon Mar 03 09:19:30 2014 -0800
8036147: Increment hsx 24.55 build to b02 for 7u55-b11
Reviewed-by: jcoomes
changeset 49cada8e39b9 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=49cada8e39b9
author: dholmes
date: Fri Feb 28 17:30:14 2014 +0000
8014460: Need to check for non-empty EXT_LIBS_PATH before using it
Reviewed-by: tbell, collins, sla, coleenp
changeset 2c47e6310e00 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2c47e6310e00
author: katleman
date: Tue Mar 04 12:01:41 2014 -0800
Added tag jdk7u55-b11 for changeset 49cada8e39b9
changeset 67a853a5a05c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=67a853a5a05c
author: asaha
date: Thu Mar 06 13:40:24 2014 -0800
8036837: Increment hsx 24.55 build to b03 for 7u55-b12
Reviewed-by: jcoomes
changeset 8cc154e4a3d6 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=8cc154e4a3d6
author: poonam
date: Fri Feb 28 02:45:17 2014 -0800
8035283: Second phase of branch shortening doesn't account for loop alignment
Summary: added missing check for loop padding case.
Reviewed-by: kvn, jrose
changeset aadc864abd1c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=aadc864abd1c
author: hseigel
date: Thu Feb 20 13:51:45 2014 -0500
8034926: Attribute classes properly
Summary: Add check to prevent underflow
Reviewed-by: coleenp, ahgross
changeset b021fd817a01 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b021fd817a01
author: katleman
date: Tue Mar 11 12:59:26 2014 -0700
Added tag jdk7u55-b12 for changeset aadc864abd1c
changeset d27b468d5f3b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=d27b468d5f3b
author: katleman
date: Tue Mar 18 12:07:41 2014 -0700
Added tag jdk7u55-b13 for changeset b021fd817a01
changeset dff9147a7816 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=dff9147a7816
author: katleman
date: Thu Mar 27 11:23:03 2014 -0700
Added tag jdk7u55-b30 for changeset d27b468d5f3b
changeset ee5d9f6749da in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=ee5d9f6749da
author: andrew
date: Wed Apr 16 19:41:09 2014 +0100
Merge jdk7u55-b14
diffstat:
.hgtags | 40 +
.jcheck/conf | 2 -
agent/src/os/linux/Makefile | 11 +-
agent/src/os/linux/libproc.h | 29 +-
make/bsd/makefiles/arm.make | 6 +-
make/bsd/makefiles/buildtree.make | 1 +
make/bsd/makefiles/vm.make | 1 +
make/hotspot_version | 6 +-
make/linux/makefiles/adlc.make | 2 +
make/linux/makefiles/arm.make | 6 +-
make/linux/makefiles/buildtree.make | 18 +
make/linux/makefiles/defs.make | 52 +-
make/linux/makefiles/gcc.make | 32 +-
make/linux/makefiles/jsig.make | 6 +-
make/linux/makefiles/rules.make | 15 +-
make/linux/makefiles/saproc.make | 6 +-
make/linux/makefiles/vm.make | 64 +-
make/linux/makefiles/zero.make | 4 +
make/linux/makefiles/zeroshark.make | 37 +
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/vm.make | 8 +
src/cpu/x86/vm/c2_globals_x86.hpp | 2 +-
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/cppInterpreter_arm.S | 7384 +++++++++
src/cpu/zero/vm/cppInterpreter_zero.cpp | 49 +
src/cpu/zero/vm/cppInterpreter_zero.hpp | 2 +
src/cpu/zero/vm/entryFrame_zero.hpp | 4 +-
src/cpu/zero/vm/frame_zero.inline.hpp | 2 +-
src/cpu/zero/vm/methodHandles_zero.hpp | 6 +-
src/cpu/zero/vm/sharedRuntime_zero.cpp | 4 +-
src/cpu/zero/vm/thumb2.cpp | 7985 ++++++++++
src/cpu/zero/vm/vm_version_zero.hpp | 11 +
src/os/bsd/vm/attachListener_bsd.cpp | 4 +-
src/os/linux/vm/os_linux.cpp | 183 +-
src/os/windows/vm/os_windows.cpp | 107 +-
src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +-
src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp | 31 +-
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 | 6 +
src/share/tools/hsdis/Makefile | 10 +-
src/share/tools/hsdis/hsdis.c | 5 +
src/share/vm/asm/codeBuffer.hpp | 2 +-
src/share/vm/ci/ciTypeFlow.cpp | 2 +-
src/share/vm/classfile/classFileParser.cpp | 7 +-
src/share/vm/classfile/systemDictionary.cpp | 1 -
src/share/vm/compiler/methodLiveness.cpp | 12 +-
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 2 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 +-
src/share/vm/gc_implementation/g1/concurrentMark.cpp | 2 +-
src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp | 2 +-
src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 2 +-
src/share/vm/gc_implementation/parNew/parNewGeneration.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +-
src/share/vm/interpreter/bytecodeInterpreter.hpp | 22 +-
src/share/vm/memory/collectorPolicy.cpp | 18 +-
src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +-
src/share/vm/oops/objArrayKlass.cpp | 2 +-
src/share/vm/oops/objArrayKlass.inline.hpp | 4 +-
src/share/vm/opto/matcher.cpp | 32 +-
src/share/vm/opto/output.cpp | 15 +-
src/share/vm/prims/jni.cpp | 2 +-
src/share/vm/prims/jvm.cpp | 2 +-
src/share/vm/prims/jvmtiEnv.cpp | 3 +
src/share/vm/prims/jvmtiExport.cpp | 41 +
src/share/vm/prims/jvmtiExport.hpp | 7 +
src/share/vm/runtime/arguments.cpp | 11 +-
src/share/vm/runtime/globals.hpp | 2 +-
src/share/vm/runtime/os.cpp | 41 +-
src/share/vm/runtime/os.hpp | 4 -
src/share/vm/shark/sharkCompiler.cpp | 5 +-
src/share/vm/shark/shark_globals.hpp | 10 +
src/share/vm/trace/trace.dtd | 3 -
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/bitMap.inline.hpp | 20 +-
src/share/vm/utilities/macros.hpp | 8 +
src/share/vm/utilities/ostream.cpp | 2 +-
src/share/vm/utilities/vmError.cpp | 23 +-
src/share/vm/utilities/vmError.hpp | 8 +
test/runtime/7020373/GenOOMCrashClass.java | 157 +
test/runtime/7020373/Test7020373.sh | 4 +
test/runtime/7020373/testcase.jar | Bin
test/runtime/InitialThreadOverflow/DoOverflow.java | 41 +
test/runtime/InitialThreadOverflow/invoke.cxx | 70 +
test/runtime/InitialThreadOverflow/testme.sh | 73 +
tools/mkbc.c | 607 +
103 files changed, 25924 insertions(+), 369 deletions(-)
diffs (truncated from 28167 to 500 lines):
diff -r cf4110c35afb -r ee5d9f6749da .hgtags
--- a/.hgtags Thu Dec 19 09:32:29 2013 -0800
+++ b/.hgtags Wed Apr 16 19:41:09 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
@@ -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
@@ -510,6 +518,7 @@
c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20
d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39
3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40
+ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0
3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21
d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41
aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22
@@ -530,6 +539,7 @@
88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49
24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30
41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50
+5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1
645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31
2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51
9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32
@@ -568,6 +578,11 @@
b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+f3f4df30a4684f077084f374abdebaf3af5618ee icedtea-2.4.2
+f3f4df30a4684f077084f374abdebaf3af5618ee icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+b732355257e3452875a1a8e5a5de2c553dfa705c icedtea-2.4.2
efaa26fb6de2ecb8506fb8b785a429d040e96768 jdk7u40-b61
df6f37a7311d35072a07c1425a7aadee469a09b6 jdk7u40-b62
5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
@@ -589,9 +604,12 @@
0c0dc384915cafd9bfaa2fe5792a629a22d1b990 jdk7u45-b17
12374864c655a2cefb0d65caaacf215d5365ec5f jdk7u45-b18
3677c8cc3c89c0fa608f485b84396e4cf755634b jdk7u45-b30
+b59e02d9e72bb06d5cbff39605bce1d2695dbdd0 icedtea-2.4.3
+9def299ab058289926f8e1dbf86c9d5a95eb9738 icedtea-2.4.4
520b7b3d9153c1407791325946b07c5c222cf0d6 jdk7u45-b31
c373a733d5d5147f99eaa2b91d6b937c28214fc9 jdk7u45-b33
0bcb43482f2ac5615437541ffb8dc0f79ece3148 jdk7u45-b34
+12ea8d416f105f5971c808c89dddc1006bfc4c53 jdk7u45-b35
429884602206fcf5314c8b953c06d54d337558ca jdk7u51-b00
68f03ff066f2341b89b52a6d6e21ae09de008351 jdk7u51-b01
67910a581eca113847c5320c49436a9816c5d5c6 jdk7u51-b02
@@ -606,3 +624,25 @@
1f11dff734af98f5bf11d4fceeda221ab1416971 jdk7u51-b11
dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
+2cb58882dac3bf8b186ef15f847be926772bbf98 icedtea-2.4.5
+00478c5bf5e93892b40bac1c293f8540d5be58ab icedtea-2.4.6pre01
+172674e0ab65752a9a6e5bb7f563e03f8ca44be1 icedtea-2.4.6
+69b542696e5b678269d2a69b6163eb1471f84224 icedtea-2.4.7
+a398ddc79d2310ad37b131cc3794b3cf574f088e jdk7u51-b30
+cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
+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
diff -r cf4110c35afb -r ee5d9f6749da .jcheck/conf
--- a/.jcheck/conf Thu Dec 19 09:32:29 2013 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r cf4110c35afb -r ee5d9f6749da agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile Thu Dec 19 09:32:29 2013 -0800
+++ b/agent/src/os/linux/Makefile Wed Apr 16 19:41:09 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 cf4110c35afb -r ee5d9f6749da agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h Thu Dec 19 09:32:29 2013 -0800
+++ b/agent/src/os/linux/libproc.h Wed Apr 16 19:41:09 2014 +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 cf4110c35afb -r ee5d9f6749da make/bsd/makefiles/arm.make
--- a/make/bsd/makefiles/arm.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/bsd/makefiles/arm.make Wed Apr 16 19:41:09 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
Obj_Files += bsd_arm.o
-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+ifneq ($(EXT_LIBS_PATH),)
+ LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+endif
CFLAGS += -DVM_LITTLE_ENDIAN
diff -r cf4110c35afb -r ee5d9f6749da make/bsd/makefiles/buildtree.make
--- a/make/bsd/makefiles/buildtree.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/bsd/makefiles/buildtree.make Wed Apr 16 19:41:09 2014 +0100
@@ -215,6 +215,7 @@
echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
echo "OPENJDK = $(OPENJDK)"; \
+ echo "ZERO_BUILD = $(ZERO_BUILD)"; \
echo; \
echo "# Used for platform dispatching"; \
echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
diff -r cf4110c35afb -r ee5d9f6749da make/bsd/makefiles/vm.make
--- a/make/bsd/makefiles/vm.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/bsd/makefiles/vm.make Wed Apr 16 19:41:09 2014 +0100
@@ -27,6 +27,7 @@
# Common build rules.
MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles
+include $(GAMMADIR)/make/defs.make
include $(MAKEFILES_DIR)/rules.make
include $(GAMMADIR)/make/altsrc.make
diff -r cf4110c35afb -r ee5d9f6749da make/hotspot_version
--- a/make/hotspot_version Thu Dec 19 09:32:29 2013 -0800
+++ b/make/hotspot_version Wed Apr 16 19:41:09 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,10 @@
#
# Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2013
+HOTSPOT_VM_COPYRIGHT=Copyright 2014
HS_MAJOR_VER=24
-HS_MINOR_VER=51
+HS_MINOR_VER=55
HS_BUILD_NUMBER=03
JDK_MAJOR_VER=1
diff -r cf4110c35afb -r ee5d9f6749da make/linux/makefiles/adlc.make
--- a/make/linux/makefiles/adlc.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/linux/makefiles/adlc.make Wed Apr 16 19:41:09 2014 +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 cf4110c35afb -r ee5d9f6749da make/linux/makefiles/arm.make
--- a/make/linux/makefiles/arm.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/linux/makefiles/arm.make Wed Apr 16 19:41:09 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
Obj_Files += linux_arm.o
-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+ifneq ($(EXT_LIBS_PATH),)
+ LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+endif
CFLAGS += -DVM_LITTLE_ENDIAN
diff -r cf4110c35afb -r ee5d9f6749da make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/linux/makefiles/buildtree.make Wed Apr 16 19:41:09 2014 +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
@@ -208,6 +209,7 @@
echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
echo "OPENJDK = $(OPENJDK)"; \
+ echo "ZERO_BUILD = $(ZERO_BUILD)"; \
echo; \
echo "# Used for platform dispatching"; \
echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
@@ -406,6 +408,7 @@
DATA_MODE/sparcv9 = 64
DATA_MODE/amd64 = 64
DATA_MODE/ia64 = 64
+DATA_MODE/ppc64 = 64
DATA_MODE/zero = $(ARCH_DATA_MODEL)
JAVA_FLAG/32 = -d32
@@ -414,6 +417,9 @@
WRONG_DATA_MODE_MSG = \
echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK."
+WRONG_JDK_MSG = \
+ echo "JAVA_HOME must point to a HotSpot based JDK \\\(genuine Sun/Oracle or OpenJDK\\\)."
+
CROSS_COMPILING_MSG = \
echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
@@ -450,6 +456,14 @@
echo " exit 0"; \
echo "fi"; \
echo ""; \
+ echo "# 'gamma' only runs with HotSpot based JDKs (genuine Sun/Oracle or OpenJDK)"; \
+ echo ""; \
+ echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -version 2>&1 | grep -E 'OpenJDK|HotSpot' > /dev/null"; \
+ echo "if [ \$$? -ne 0 ]; then "; \
+ echo " $(WRONG_JDK_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
echo "# Use gamma_g if it exists"; \
echo ""; \
echo "GAMMA_PROG=gamma"; \
@@ -457,6 +471,10 @@
echo " GAMMA_PROG=gamma_g"; \
echo "fi"; \
echo ""; \
+ echo "if [ -x \"$(PAX_COMMAND)\" ]; then "; \
+ echo " $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \
+ echo "fi"; \
+ echo ""; \
echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \
echo " # NOTE: gamma assumes the OpenJDK directory layout."; \
diff -r cf4110c35afb -r ee5d9f6749da make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/linux/makefiles/defs.make Wed Apr 16 19:41:09 2014 +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 cf4110c35afb -r ee5d9f6749da make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make Thu Dec 19 09:32:29 2013 -0800
+++ b/make/linux/makefiles/gcc.make Wed Apr 16 19:41:09 2014 +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)),)
More information about the distro-pkg-dev
mailing list