Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 16 deletions

diff --git a/compiler/rustc_target/src/spec/android_base.rs b/compiler/rustc_target/src/spec/android_base.rs
deleted file mode 100644
index 9c1df1a06..000000000
--- a/compiler/rustc_target/src/spec/android_base.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::spec::{SanitizerSet, TargetOptions};
-
-pub fn opts() -> TargetOptions {
-    let mut base = super::linux_base::opts();
-    base.os = "android".into();
-    base.is_like_android = true;
-    base.default_dwarf_version = 2;
-    base.has_thread_local = false;
-    base.supported_sanitizers = SanitizerSet::ADDRESS;
-    // This is for backward compatibility, see https://github.com/rust-lang/rust/issues/49867
-    // for context. (At that time, there was no `-C force-unwind-tables`, so the only solution
-    // was to always emit `uwtable`).
-    base.default_uwtable = true;
-    base.crt_static_respected = true;
-    base
-}