Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore flags lost in merge. ihse-cflags-rewrite-branch
authorihse
Mon, 11 Jun 2018 14:30:29 +0200
branchihse-cflags-rewrite-branch
changeset 56731 f63e409d85ce
parent 56727 16f9bd701b85
child 56732 298e0b8056a3
Restore flags lost in merge.
make/hotspot/gensrc/GensrcDtrace.gmk file | annotate | diff | comparison | revisions 
--- a/make/hotspot/gensrc/GensrcDtrace.gmk	Mon Jun 11 12:17:06 2018 +0200
+++ b/make/hotspot/gensrc/GensrcDtrace.gmk	Mon Jun 11 14:30:29 2018 +0200
@@ -74,6 +74,8 @@
         TOOLCHAIN := $(TOOLCHAIN_BUILD), \
         LDFLAGS := -m64, \
         CFLAGS := -m64 $(JVM_CFLAGS), \
+        DISABLED_WARNINGS_solstudio := hidef w_novirtualdescr unknownpragma \
+            doubunder nokeyworddefine wunreachable, \
         EXTRA_DEPS := $(JVMTI_H), \
         OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \
         OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \
jdk-sandbox