diff -r bb747891a0b6 -r cc7fb0b2445a jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt
--- a/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt	Mon Jul 18 14:21:17 2016 -0700
+++ b/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt	Wed Jul 20 12:53:25 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -49,12 +49,12 @@
 # Name of jar file that needs to be created
 JARFILE=mtrace.jar
 
-# Solaris Sun C Compiler Version 5.5
+# Solaris Studio C Compiler Version 12.4
 ifeq ($(OSNAME), solaris)
     # Sun Solaris Compiler options needed
     COMMON_FLAGS=-mt -KPIC
     # Options that help find errors
-    COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none
+    COMMON_FLAGS+= -Xa -v -xc99=%none
     # Check LIBARCH for any special compiler options
     LIBARCH=$(shell uname -p)
     ifeq ($(LIBARCH), sparc)