8311846: Resolve duplicate 'Thread' related symbols with JDK static l…

…inking

src/hotspot/os_cpu/linux_aarch64/threadLS_linux_aarch64.S

@@ -31,10 +31,10 @@
 _ZN10JavaThread25aarch64_get_thread_helperEv:
 	hint #0x19      // paciasp
 	stp x29, x30, [sp, -16]!
-	adrp x0, :tlsdesc:_ZN6Thread12_thr_currentE
-	ldr x1, [x0, #:tlsdesc_lo12:_ZN6Thread12_thr_currentE]
-	add x0, x0, :tlsdesc_lo12:_ZN6Thread12_thr_currentE
-	.tlsdesccall _ZN6Thread12_thr_currentE
+	adrp x0, :tlsdesc:_ZN17HotspotBaseThread12_thr_currentE
+	ldr x1, [x0, #:tlsdesc_lo12:_ZN17HotspotBaseThread12_thr_currentE]
+	add x0, x0, :tlsdesc_lo12:_ZN17HotspotBaseThread12_thr_currentE
+	.tlsdesccall _ZN17HotspotBaseThread12_thr_currentE
 	blr x1
 	mrs x1, tpidr_el0
 	add x0, x1, x0

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

@@ -1022,6 +1022,10 @@ enum LockingMode {
   LM_LIGHTWEIGHT = 2
 };
 
+// Redefine Thread as BaseThread to avoid duplicate symbol issues for
+// JDK static builds. See runtime/thread.hpp for Thread class.
+#define Thread HotspotBaseThread
+
 //----------------------------------------------------------------------------------------------------
 // Special constants for debugging
 

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");