Auto merge of rust-lang#75838 - mati865:profiler-atomics, r=Amanieu

bors · bors · commit 589056385948 · 2020-08-25T11:53:07.000Z
Profiler: reenable atomics after rust-lang#65214
diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs
@@ -65,7 +65,7 @@ fn main() {
     // This should be a pretty good heuristic for when to set
     // COMPILER_RT_HAS_ATOMICS
     if env::var_os("CARGO_CFG_TARGET_HAS_ATOMIC")
-        .map(|features| features.to_string_lossy().to_lowercase().contains("cas"))
+        .map(|features| features.to_string_lossy().to_lowercase().contains("ptr"))
         .unwrap_or(false)
     {
         cfg.define("COMPILER_RT_HAS_ATOMICS", Some("1"));

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ fn main() {`
`65`	`65`	`// This should be a pretty good heuristic for when to set`
`66`	`66`	`// COMPILER_RT_HAS_ATOMICS`
`67`	`67`	`if env::var_os("CARGO_CFG_TARGET_HAS_ATOMIC")`
`68`		`- .map(\|features\| features.to_string_lossy().to_lowercase().contains("cas"))`
	`68`	`+ .map(\|features\| features.to_string_lossy().to_lowercase().contains("ptr"))`
`69`	`69`	`.unwrap_or(false)`
`70`	`70`	`{`
`71`	`71`	`cfg.define("COMPILER_RT_HAS_ATOMICS", Some("1"));`