make/solaris/makefiles/dtrace.make

*** 1,7 ****
  #
! # Copyright (c) 2005, 2008, 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.
--- 1,7 ----
  #
! # Copyright (c) 2005, 2010, 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.
*** 61,72 ****
  DTRACE_OPTS = -64 -D_LP64
  endif
  
  # making libjvm_db
  
- INCLS = $(GENERATED)/incls
- 
  # Use mapfile with libjvm_db.so
  LIBJVM_DB_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jvm_db
  LFLAGS_JVM_DB += $(MAPFLAG:FILENAME=$(LIBJVM_DB_MAPFILE))
  
  # Use mapfile with libjvm_dtrace.so
--- 61,70 ----
*** 112,122 ****
  else
  LFLAGS_GENOFFS += -mt -xnolib -norunpath
  endif
  
  lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
!                   $(INCLS)/_vmStructs.cpp.incl $(LIBJVM.o)
          $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
                   $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc
  
  $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
          $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
--- 110,120 ----
  else
  LFLAGS_GENOFFS += -mt -xnolib -norunpath
  endif
  
  lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
!                   $(LIBJVM.o)
          $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
                   $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc
  
  $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
          $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
*** 159,168 ****
--- 157,187 ----
  
  $(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
               $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
          $(QUIETLY) cat $^ > $@
  
+ DTraced_Files = ciEnv.o \
+                 classLoadingService.o \
+                 compileBroker.o \
+                 hashtable.o \
+                 instanceKlass.o \
+                 java.o \
+                 jni.o \
+                 jvm.o \
+                 memoryManager.o \
+                 nmethod.o \
+                 objectMonitor_${Platform_os_family}.o \
+                 runtimeService.o \
+                 sharedRuntime.o \
+                 synchronizer.o \
+                 thread.o \
+                 unsafe.o \
+                 vmThread.o \
+                 vmCMSOperations.o \
+                 vmPSOperations.o \
+                 vmGCOperations.o \
+ 
  # Dtrace is available, so we build $(DTRACE.o)  
  $(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files)
          @echo Compiling $(DTRACE).d
  
          $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -xlazyload -o $@ -s $(DTRACE).d \