make/hotspot/lib/CompileJvm.gmk

rev 59102 : imported patch build

@@ -27,13 +27,10 @@
 # jvm feature set, specific file overrides, and general flags.
 include lib/JvmFeatures.gmk
 include lib/JvmOverrideFiles.gmk
 include lib/JvmFlags.gmk
 
-# Include support files that will setup DTRACE_EXTRA_OBJECT_FILES.
-include lib/JvmDtraceObjects.gmk
-
 ################################################################################
 # Setup compilation of the main Hotspot native library (libjvm).
 
 JVM_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/libjvm
 JVM_MAPFILE := $(JVM_OUTPUTDIR)/mapfile

@@ -58,12 +55,10 @@
 JVM_EXCLUDES += adlc
 
 # Needed by abstract_vm_version.cpp
 ifeq ($(call isTargetCpu, x86_64), true)
   OPENJDK_TARGET_CPU_VM_VERSION := amd64
-else ifeq ($(call isTargetCpu, sparcv9), true)
-  OPENJDK_TARGET_CPU_VM_VERSION := sparc
 else
   OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU)
 endif
 
 CFLAGS_VM_VERSION := \

@@ -95,14 +90,10 @@
 DISABLED_WARNINGS_clang := tautological-compare \
     undefined-var-template sometimes-uninitialized unknown-pragmas \
     delete-non-virtual-dtor missing-braces char-subscripts \
     ignored-qualifiers missing-field-initializers mismatched-tags
 
-DISABLED_WARNINGS_solstudio := labelnotused hidef w_novirtualdescr inlafteruse \
-    unknownpragma doubunder w_enumnotused w_toomanyenumnotused \
-    wvarhidenmem wunreachable wnoretvalue notemsource
-
 DISABLED_WARNINGS_xlc := tautological-compare shift-negative-value
 
 DISABLED_WARNINGS_microsoft :=
 
 

@@ -132,33 +123,10 @@
   JVM_EXCLUDE_PATTERNS += x86_64
 else ifeq ($(call isTargetCpu, x86_64), true)
   JVM_EXCLUDE_PATTERNS += x86_32
 endif
 
-# Inline assembly for solaris
-ifeq ($(call isTargetOs, solaris), true)
-  ifeq ($(call isTargetCpu, x86_64), true)
-    JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il
-  else ifeq ($(call isTargetCpu, sparcv9), true)
-    JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il
-  endif
-  # Exclude warnings in devstudio 12.6
-  ifeq ($(CC_VERSION_NUMBER), 5.15)
-    DISABLED_WARNINGS_solstudio += SEC_ARR_OUTSIDE_BOUND_READ \
-      SEC_ARR_OUTSIDE_BOUND_WRITE
-  endif
-endif
-
-ifeq ($(call And, $(call isTargetOs, solaris) $(call isTargetCpu, sparcv9)), true)
-  ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), false)
-    # NOTE: In the old build, we weirdly enough set -g/-g0 always, regardless
-    # of if debug symbols were needed. Without it, compilation fails on
-    # sparc! :-(
-    JVM_CFLAGS += -g0
-  endif
-endif
-
 ifeq ($(call isTargetOs, windows), true)
   ifeq ($(call isTargetCpuBits, 64), true)
     RC_DESC := 64-Bit$(SPACE)
   endif
   JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM"

@@ -189,11 +157,10 @@
     CFLAGS := $(JVM_CFLAGS), \
     abstract_vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc), \
     DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang), \
-    DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
     DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \
     DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft), \
     ASFLAGS := $(JVM_ASFLAGS), \
     LDFLAGS := $(JVM_LDFLAGS), \
     LIBS := $(JVM_LIBS), \

@@ -273,34 +240,24 @@
 # for the associated class.  If the class doesn't provide a more specific
 # declaration (either directly or by inheriting from a class that provides
 # one) then the global definition will be used, triggering this check.
 
 ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
+  ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
 
     DEMANGLED_REGEXP := [^:]operator (new|delete)
 
     # Running c++filt to find offending symbols in all files is too expensive,
-    # especially on Solaris, so use mangled names when looking for symbols.
+    # so use mangled names when looking for symbols.
     # Save the demangling for when something is actually found.
-    ifeq ($(TOOLCHAIN_TYPE), solstudio)
-      MANGLED_SYMS := \
-          __1c2n6FL_pv_ \
-          __1c2N6FL_pv_ \
-          __1c2k6Fpv_v_ \
-          __1c2K6Fpv_v_ \
-          #
-      UNDEF_PATTERN := UNDEF
-    else
       MANGLED_SYMS := \
           _ZdaPv \
           _ZdlPv \
           _Znam \
           _Znwm \
           #
       UNDEF_PATTERN := ' U '
-    endif
 
     define SetupOperatorNewDeleteCheck
         $1.op_check: $1
           if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \
               | $(GREP) $(UNDEF_PATTERN)`" ]; then \