Redefine 'BaseThread' to 'HotspotBaseThread' in hotspot. Change SA (s…

…erviceability agent) to use 'HotspotBaseThread' correspondingly.

src/hotspot/share/runtime/threadLocalStorage.hpp

@@ -26,6 +26,7 @@
 #define SHARE_RUNTIME_THREADLOCALSTORAGE_HPP
 
 #include "memory/allStatic.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // forward-decl as we can't have an include cycle
 class Thread;

src/hotspot/share/utilities/globalDefinitions.hpp

@@ -1023,6 +1023,10 @@ enum JavaThreadState {
   _thread_max_state         = 12  // maximum thread state+1 - used for statistics allocation
 };
 
+// Redefine Thread as BaseThread to avoid duplicate symbol issues for
+// JDK static builds. See runtime/thread.hpp for Thread class.
+#define Thread HotspotBaseThread
+
 enum LockingMode {
   // Use only heavy monitors for locking
   LM_MONITOR     = 0,

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java

@@ -49,7 +49,7 @@ public void update(Observable o, Object data) {
   }
 
   private static synchronized void initialize(TypeDataBase db) {
-    Type typeThread = db.lookupType("Thread");
+    Type typeThread = db.lookupType("HotspotBaseThread");
     Type typeJavaThread = db.lookupType("JavaThread");
 
     suspendFlagsField = typeJavaThread.getCIntegerField("_suspend_flags");