chore: remove dl_iterate_phdr_feature

Cargo.toml

@@ -2,7 +2,6 @@
 name = "backtrace"
 version = "0.3.73"
 authors = ["The Rust Project Developers"]
-build = "build.rs"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/rust-lang/backtrace-rs"
@@ -49,11 +48,6 @@ version = "0.36.0"
 default-features = false
 features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive']
 
-[build-dependencies]
-# Only needed for Android, but cannot be target dependent
-# https://github.com/rust-lang/cargo/issues/4932
-cc = "1.0.97"
-
 [dev-dependencies]
 dylib-dep = { path = "crates/dylib-dep" }
 libloading = "0.7"
@@ -74,7 +68,6 @@ serialize-serde = ["serde"]
 # purposes. New code should use none of these features.
 coresymbolication = []
 dbghelp = []
-dl_iterate_phdr = []
 dladdr = []
 kernel32 = []
 libunwind = []

crates/as-if-std/build.rs

@@ -1,11 +1,3 @@
-// backtrace-rs requires a feature check on Android targets, so
-// we need to run its build.rs as well.
-#[allow(unused_extern_crates)]
-#[path = "../../build.rs"]
-mod backtrace_build_rs;
-
 fn main() {
     println!("cargo:rustc-cfg=backtrace_in_libstd");
-
-    backtrace_build_rs::main();
 }

src/symbolize/gimli.rs

@@ -100,7 +100,7 @@ impl Mapping {
             // only borrow `map` and `stash` and we're preserving them below.
             cx: unsafe { core::mem::transmute::<Context<'_>, Context<'static>>(cx) },
             _map: data,
-            stash: stash,
+            stash,
         })
     }
 }
@@ -122,13 +122,11 @@ impl<'data> Context<'data> {
             if cfg!(not(target_os = "aix")) {
                 let data = object.section(stash, id.name()).unwrap_or(&[]);
                 Ok(EndianSlice::new(data, Endian))
+            } else if let Some(name) = id.xcoff_name() {
+                let data = object.section(stash, name).unwrap_or(&[]);
+                Ok(EndianSlice::new(data, Endian))
             } else {
-                if let Some(name) = id.xcoff_name() {
-                    let data = object.section(stash, name).unwrap_or(&[]);
-                    Ok(EndianSlice::new(data, Endian))
-                } else {
-                    Ok(EndianSlice::new(&[], Endian))
-                }
+                Ok(EndianSlice::new(&[], Endian))
             }
         })
         .ok()?;
@@ -226,7 +224,7 @@ cfg_if::cfg_if! {
             target_os = "hurd",
             target_os = "openbsd",
             target_os = "netbsd",
-            all(target_os = "android", feature = "dl_iterate_phdr"),
+            target_os = "android",
         ),
         not(target_env = "uclibc"),
     ))] {