Remove obsolete support for linking unwinder on Android

pcc · pcc · commit d44975813540 · 2023-11-02T17:50:43.000-07:00
Linking libgcc is no longer supported (see rust-lang#103673), so remove the related link attributes and the check in unwind's build.rs. The check was the last remaining significant piece of logic in build.rs, so remove build.rs as well.
diff --git a/library/backtrace b/library/backtrace
@@ -1 +1 @@
-Subproject commit e9da96eb452aa65e79e2342be700544afe509440
+Subproject commit 8ad84ca5ad88ade697637387e7cb4d7c3cf4bde8
diff --git a/library/stdarch b/library/stdarch
@@ -1 +1 @@
-Subproject commit f4528dd6e85d97bb802240d7cd048b6e1bf72540
+Subproject commit b655243782c18d3419439daa523782e0818ecf26
diff --git a/library/unwind/Cargo.toml b/library/unwind/Cargo.toml
@@ -19,9 +19,6 @@ libc = { version = "0.2.79", features = ['rustc-dep-of-std'], default-features =
 compiler_builtins = "0.1.0"
 cfg-if = "1.0"
 
-[build-dependencies]
-cc = "1.0.76"
-
 [features]
 
 # Only applies for Linux and Fuchsia targets
diff --git a/library/unwind/build.rs b/library/unwind/build.rs
diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
@@ -76,14 +76,10 @@ cfg_if::cfg_if! {
 cfg_if::cfg_if! {
     if #[cfg(feature = "llvm-libunwind")] {
         compile_error!("`llvm-libunwind` is not supported for Android targets");
-    } else if #[cfg(feature = "system-llvm-libunwind")] {
+    } else {
         #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
         #[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
         extern "C" {}
-    } else {
-        #[link(name = "gcc", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
-        #[link(name = "gcc", cfg(not(target_feature = "crt-static")))]
-        extern "C" {}
     }
 }
 // Android's unwinding library depends on dl_iterate_phdr in `libdl`.
diff --git a/src/doc/book b/src/doc/book
@@ -1 +1 @@
-Subproject commit 3dca2fc50b922a8efb94903b9fee8bb42ab48f38
+Subproject commit c06006157b14b3d47b5c716fc392b77f3b2e21ce
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
@@ -1 +1 @@
-Subproject commit 34fca48ed284525b2f124bf93c51af36d6685492
+Subproject commit 6038be9d37d7251c966b486154af621d1794d7af
diff --git a/src/doc/embedded-book b/src/doc/embedded-book
@@ -1 +1 @@
-Subproject commit 22bca3d0f6e9b9b556689b54ce96f25b46ecd1b3
+Subproject commit 701d1551429da4cb609082c0ac99df569e336710
diff --git a/src/doc/nomicon b/src/doc/nomicon
@@ -1 +1 @@
-Subproject commit 1842257814919fa62e81bdecd5e8f95be2839dbb
+Subproject commit b5f7500fc40775096c2bbd204eae096612cf9047
diff --git a/src/doc/reference b/src/doc/reference
@@ -1 +1 @@
-Subproject commit 16fd3c06d9e558dae2d52000818274ae70c9e90a
+Subproject commit 1f8dc727e94ae4ef92adf70df979521a1ea1143e
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
@@ -1 +1 @@
-Subproject commit 6709beeb7d0fbc5ffc91ac4893a24434123b9bfa
+Subproject commit 31961fe22521a779070a44a8f30a2b00a20b6212
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
@@ -1 +1 @@
-Subproject commit b0ee9ec8fa59a6c7620165e061f4747202377a62
+Subproject commit 6337ed17fb8dcd918d78b7d97d213e923530337c
diff --git a/src/llvm-project b/src/llvm-project
@@ -1 +1 @@
-Subproject commit fef3d7b14ede45d051dc688aae0bb8c8b02a0566
+Subproject commit ea6fa9c2d43aaf0f11559719eda9b54d356d5416
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit b4d18d4bd3db6d872892f6c87c51a02999b80802
+Subproject commit d0a4cbcee614fdb7ba66e860e603a00a644d71f8
