jdk/make/CompileDemos.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 217,226 ****
--- 217,229 ----
    # Param 5 = libs for unix
    # Param 6 = libs for windows
    # Param 7 = libs for solaris
    # Param 8 = libs for linux
    # Param 9 = extra directories with required sources
+   # Param 10 = DISABLED_WARNINGS_gcc
+   # Param 11 = DISABLED_WARNINGS_microsoft
+   # Param 12 = DISABLED_WARNINGS_clang
    BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \
        $$(wildcard $(DEMO_OS_TYPE_SRC)/jvmti/$1) \
        $$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, $2)) \
        $9
    BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE := \
*** 252,261 ****
--- 255,267 ----
    $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
        SRC := $(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
        LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
        OPTIMIZATION := LOW, \
        CXXFLAGS := $$($1_CXXFLAGS), \
+       DISABLED_WARNINGS_gcc := $(10), \
+       DISABLED_WARNINGS_clang := $(12), \
+       DISABLED_WARNINGS_microsoft := $(11), \
        LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
        LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
        LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
        LDFLAGS_SUFFIX_unix := $5, \
        LDFLAGS_SUFFIX_windows := $6, \
*** 308,324 ****
      BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.lib \
          $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.exp
    endif
  endef
  
! $(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
  $(eval $(call SetupJVMTIDemo,gctest, agent_util))
  $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
  $(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
  $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
  $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
! $(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++))
  $(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
  
  ##################################################################################################
  
  $(SUPPORT_OUTPUTDIR)/demo/image/management/index.html: $(DEMO_SHARE_SRC)/management/index.html
--- 314,330 ----
      BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.lib \
          $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.exp
    endif
  endef
  
! $(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util, , , , , , , , pointer-to-int-cast format, , format))
  $(eval $(call SetupJVMTIDemo,gctest, agent_util))
  $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
  $(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
  $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
  $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
! $(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++, , , , , , , 4101))
  $(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
  
  ##################################################################################################
  
  $(SUPPORT_OUTPUTDIR)/demo/image/management/index.html: $(DEMO_SHARE_SRC)/management/index.html