Fix exported symbol name

Author: quininer

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -1699,7 +1699,7 @@ fn exported_symbols_for_non_proc_macro(tcx: TyCtxt<'_>, crate_type: CrateType) -
     let export_threshold = symbol_export::crates_export_threshold(&[crate_type]);
     for_each_exported_symbols_include_dep(tcx, crate_type, |symbol, info, cnum| {
         if info.level.is_below_threshold(export_threshold) {
-            symbols.push(symbol_export::symbol_name_for_instance_in_crate(tcx, symbol, cnum));
+            symbols.push(symbol_export::exporting_symbol_name_for_instance_in_crate(tcx, symbol, cnum));
         }
     });
 

compiler/rustc_codegen_ssa/src/back/symbol_export.rs

@@ -608,6 +608,26 @@ pub fn linking_symbol_name_for_instance_in_crate<'tcx>(
     format!("{prefix}{undecorated}{suffix}{args_in_bytes}")
 }
 
+
+pub fn exporting_symbol_name_for_instance_in_crate<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    symbol: ExportedSymbol<'tcx>,
+    cnum: CrateNum,
+) -> String {
+    let undecorated = symbol_name_for_instance_in_crate(tcx, symbol, cnum);
+
+    if tcx.sess.target.force_emulated_tls
+        && let ExportedSymbol::NonGeneric(def_id) = symbol
+        && tcx.is_thread_local_static(def_id)                                    
+    {                                        
+        // When using emutls, LLVM will add the `__emutls_v.` prefix to thread local symbols,
+        // and exported symbol name need to match this.
+        format!("__emutls_v.{undecorated}")                                                   
+    } else {                                   
+        undecorated        
+    }    
+}
+
 fn wasm_import_module_map(tcx: TyCtxt<'_>, cnum: CrateNum) -> FxHashMap<DefId, String> {
     // Build up a map from DefId to a `NativeLib` structure, where
     // `NativeLib` internally contains information about

compiler/rustc_target/src/spec/base/android.rs

@@ -5,6 +5,7 @@ pub fn opts() -> TargetOptions {
     base.os = "android".into();
     base.is_like_android = true;
     base.default_dwarf_version = 2;
+    base.force_emulated_tls = true;
     base.has_thread_local = true;
     base.supported_sanitizers = SanitizerSet::ADDRESS;
     // This is for backward compatibility, see https://github.com/rust-lang/rust/issues/49867