changeset 32594:dea9c26a05f3

Merge
author erikj
date Fri, 28 Aug 2015 11:10:57 +0200
parents d066afd32088 a7b94dee5c9d
children 8cde9aca5e9f 8feecdee3156
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/make/solaris/makefiles/adlc.make	Fri Aug 28 09:05:46 2015 +0200
+++ b/hotspot/make/solaris/makefiles/adlc.make	Fri Aug 28 11:10:57 2015 +0200
@@ -76,6 +76,11 @@
 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
   CFLAGS_WARN = +w -errwarn
 endif
+# When using compiler version 5.13 (Solaris Studio 12.4), calls to explicitly 
+# instantiated template functions trigger this warning when +w is active.
+ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 513), 1)
+  CFLAGS_WARN += -erroff=notemsource
+endif
 CFLAGS += $(CFLAGS_WARN)
 
 ifeq ("${Platform_compiler}", "sparcWorks")