/hg/release/icedtea7-forest-2.4/hotspot: 12 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 4 10:23:25 PDT 2013
changeset 4445f65c4793 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4445f65c4793
author: asaha
date: Mon Aug 19 12:18:27 2013 -0700
Added tag jdk7u40-b40 for changeset 86673506aeb6
changeset 4e779305ed58 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=4e779305ed58
author: katleman
date: Wed Aug 21 12:11:02 2013 -0700
Added tag jdk7u40-b41 for changeset 4445f65c4793
changeset 48193a76dc3a in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=48193a76dc3a
author: katleman
date: Mon Aug 26 07:41:23 2013 -0700
Added tag jdk7u40-b42 for changeset 4e779305ed58
changeset b006d79fa741 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b006d79fa741
author: amurillo
date: Fri Jul 26 12:13:19 2013 -0700
8021565: new hotspot build - hs24-b56
Reviewed-by: jcoomes
changeset 84c2eb6a682b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=84c2eb6a682b
author: kevinw
date: Fri Aug 02 12:26:46 2013 +0100
8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
Reviewed-by: mgerdin, fparain, dcubed
changeset 2bf38259b945 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=2bf38259b945
author: amurillo
date: Mon Aug 26 11:51:26 2013 -0700
8023751: Need to backout 8020943, was pushed to hs24 without approval
Reviewed-by: jcoomes
changeset b8d8caf6df74 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=b8d8caf6df74
author: amurillo
date: Mon Aug 26 11:56:32 2013 -0700
Merge
changeset eceae0478243 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=eceae0478243
author: amurillo
date: Mon Aug 26 11:56:33 2013 -0700
Added tag hs24-b56 for changeset b8d8caf6df74
changeset af1fc2868a2b in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=af1fc2868a2b
author: katleman
date: Tue Aug 27 08:42:54 2013 -0700
Added tag jdk7u40-b43 for changeset eceae0478243
changeset bf3a8b634b75 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=bf3a8b634b75
author: katleman
date: Tue Sep 03 22:34:28 2013 -0700
Added tag jdk7u40-b60 for changeset af1fc2868a2b
changeset 30b96ab0954c in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=30b96ab0954c
author: andrew
date: Wed Sep 04 16:45:43 2013 +0100
Merge jdk7u40-b60
changeset f3f4df30a468 in /hg/release/icedtea7-forest-2.4/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot?cmd=changeset;node=f3f4df30a468
author: andrew
date: Wed Sep 04 18:21:33 2013 +0100
PR1551: Add build support for Zero AArch64
diffstat:
.hgtags | 16 +
.jcheck/conf | 2 -
agent/src/os/linux/Makefile | 11 +-
agent/src/os/linux/libproc.h | 29 +-
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 | 61 ++-
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 | 12 +
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/linux/vm/os_linux.cpp | 62 +++-
src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp | 11 +-
src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 2 +-
src/share/vm/asm/codeBuffer.hpp | 2 +-
src/share/vm/ci/ciTypeFlow.cpp | 2 +-
src/share/vm/classfile/systemDictionary.cpp | 1 -
src/share/vm/compiler/methodLiveness.cpp | 12 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp | 2 +-
src/share/vm/memory/collectorPolicy.cpp | 2 +-
src/share/vm/memory/threadLocalAllocBuffer.cpp | 2 +-
src/share/vm/prims/jni.cpp | 2 +-
src/share/vm/prims/jvmtiEnv.cpp | 3 +
src/share/vm/runtime/arguments.cpp | 9 +-
src/share/vm/runtime/globals.hpp | 2 +-
src/share/vm/runtime/os.cpp | 3 +
src/share/vm/shark/sharkCompiler.cpp | 4 +-
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/macros.hpp | 8 +
src/share/vm/utilities/ostream.cpp | 2 +-
src/share/vm/utilities/vmError.cpp | 10 +-
test/runtime/7020373/GenOOMCrashClass.java | 157 ++++++++++
test/runtime/7020373/Test7020373.sh | 4 +
test/runtime/7020373/testcase.jar | Bin
54 files changed, 481 insertions(+), 147 deletions(-)
diffs (truncated from 1613 to 500 lines):
diff -r 86673506aeb6 -r f3f4df30a468 .hgtags
--- a/.hgtags Mon Aug 12 12:07:33 2013 -0700
+++ b/.hgtags Wed Sep 04 18:21:33 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
@@ -492,6 +500,7 @@
c23596bfe3b8a21076f8454a3cd6606ee7e928a5 jdk7u14-b20
d6cf0e0eee29e173b8446455991e22249da0e860 hs24-b39
3295faa5b5cc4f165c0e6798fd40ab4f5c17dd6d hs24-b40
+ed247f9fb4fee475dd6334d20e91779807522bb3 icedtea-2.4.0
3e88170d8be276660cd4f347bd514c446bb65d58 jdk7u14-b21
d90c913b810356d43c8e64f08c0f5e60f9c2ca08 hs24-b41
aa9a5e33e823df5f51e9b5d4e85ae91919424179 jdk7u14-b22
@@ -512,6 +521,7 @@
88e43f47a8da8093743a1b6ca1ae4b79d994472a hs24-b49
24f785f94d2f5be0f5c48e80f2a6cc7f8815dd8b jdk7u40-b30
41118cf72ace4f0cee56a9ff437226e98e46e9d7 hs24-b50
+5f53e771711627b23e8c9ac53121e1e8ea9f00b4 icedtea-2.4.1
645b68762a367d82c2b55f76cae431b767bee3ac jdk7u40-b31
2417fa1acf2ba8521f480f2baef9af279ec2bf15 hs24-b51
9658c969b7cf0de256691a80f44dcfe73d72a02f jdk7u40-b32
@@ -544,3 +554,9 @@
295528bfcdd10051f72572a26bfad2317b7de464 jdk7u40-b37
1f3b0ff9649c4be3b08cc829d37eee98d9c6e605 jdk7u40-b38
74de360e341530494c05af1ea1358abea0be93e0 jdk7u40-b39
+86673506aeb60dfa66d90233e6bbbb06e864589e jdk7u40-b40
+4445f65c4793f8421c12423396776f36765433a8 jdk7u40-b41
+4e779305ed58e21b433626ac06b5eb884055183b jdk7u40-b42
+b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
+eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
+af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
diff -r 86673506aeb6 -r f3f4df30a468 .jcheck/conf
--- a/.jcheck/conf Mon Aug 12 12:07:33 2013 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 86673506aeb6 -r f3f4df30a468 agent/src/os/linux/Makefile
--- a/agent/src/os/linux/Makefile Mon Aug 12 12:07:33 2013 -0700
+++ b/agent/src/os/linux/Makefile Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 agent/src/os/linux/libproc.h
--- a/agent/src/os/linux/libproc.h Mon Aug 12 12:07:33 2013 -0700
+++ b/agent/src/os/linux/libproc.h Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/hotspot_version
--- a/make/hotspot_version Mon Aug 12 12:07:33 2013 -0700
+++ b/make/hotspot_version Wed Sep 04 18:21:33 2013 +0100
@@ -35,7 +35,7 @@
HS_MAJOR_VER=24
HS_MINOR_VER=0
-HS_BUILD_NUMBER=55
+HS_BUILD_NUMBER=56
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
diff -r 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/adlc.make
--- a/make/linux/makefiles/adlc.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/adlc.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/buildtree.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/defs.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/gcc.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/jsig.make
--- a/make/linux/makefiles/jsig.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/jsig.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/rules.make
--- a/make/linux/makefiles/rules.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/rules.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/saproc.make
--- a/make/linux/makefiles/saproc.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/saproc.make Wed Sep 04 18:21:33 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 86673506aeb6 -r f3f4df30a468 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make Mon Aug 12 12:07:33 2013 -0700
+++ b/make/linux/makefiles/vm.make Wed Sep 04 18:21:33 2013 +0100
@@ -98,6 +98,10 @@
${HS_LIB_ARCH} \
${VM_DISTRO}
+ifdef DERIVATIVE_ID
+CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
+endif
+
# This is VERY important! The version define must only be supplied to vm_version.o
# If not, ccache will not re-use the cache at all, since the version string might contain
# a time and date.
@@ -112,6 +116,10 @@
CFLAGS += -DINCLUDE_TRACE=1
endif
+ifdef DISTRIBUTION_ID
+CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
+endif
+
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN/BYFILE)
@@ -244,13 +252,15 @@
vm.def: $(Res_Files) $(Obj_Files)
sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
-ifeq ($(JVM_VARIANT_ZEROSHARK), true)
- STATIC_CXX = false
-else
- ifeq ($(ZERO_LIBARCH), ppc64)
+ifeq ($(STATIC_CXX),)
+ ifeq ($(JVM_VARIANT_ZEROSHARK), true)
STATIC_CXX = false
else
- STATIC_CXX = true
+ ifeq ($(ZERO_LIBARCH), ppc64)
+ STATIC_CXX = false
+ else
+ STATIC_CXX = true
+ endif
endif
endif
@@ -276,9 +286,6 @@
LIBS_VM += $(LIBS)
endif
-ifeq ($(JVM_VARIANT_ZERO), true)
- LIBS_VM += $(LIBFFI_LIBS)
More information about the distro-pkg-dev
mailing list