From da4a235c269945ef48e639471ab229396b2c996a Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sat, 3 Apr 2021 21:39:25 +0300 Subject: [PATCH] rustc_target: Remove compiler-rt linking hack on Android --- compiler/rustc_target/src/spec/android_base.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/rustc_target/src/spec/android_base.rs b/compiler/rustc_target/src/spec/android_base.rs index e982b3565b56c..dc14d260e925e 100644 --- a/compiler/rustc_target/src/spec/android_base.rs +++ b/compiler/rustc_target/src/spec/android_base.rs @@ -1,14 +1,8 @@ -use crate::spec::{LinkerFlavor, TargetOptions}; +use crate::spec::TargetOptions; pub fn opts() -> TargetOptions { let mut base = super::linux_base::opts(); base.os = "android".to_string(); - // Many of the symbols defined in compiler-rt are also defined in libgcc. - // Android's linker doesn't like that by default. - base.pre_link_args - .entry(LinkerFlavor::Gcc) - .or_default() - .push("-Wl,--allow-multiple-definition".to_string()); base.dwarf_version = Some(2); base.position_independent_executables = true; base.has_thread_local = false;