clang repos migrated to main

5 files changed, 58 insertions, 55 deletions

diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum
index 9a85fda4..f1191106 100644
--- a/repos/extra/rust/.checksum
+++ b/repos/extra/rust/.checksum
@@ -1,7 +1,7 @@
-712f4eff75ea6ff0afff746c1d5b8d8bede52ca6eedd41895c655e895e8a1f9d  cargo-1.84.0-x86_64-unknown-linux-musl.tar.xz
-b4e721647f0261ef6b1e5858a557f01fcc6e8267808421d38f6e0124c5950f4b  fix-curl.patch
+ca7742d493604e180b27d98bf461d550140cee343b4fd0a9f39b86ea87441f2c  cargo-1.85.0-x86_64-unknown-linux-musl.tar.xz
+c3a18c929b155d8fd1484d2d9cef917deebc8c34ea2cb476a84ac2fb4f323840  fix-curl.patch
 98cd52ea1add75f87899eda742c302404eea756a27d9a62b6bb318db0c6b34ac  fix-linux_musl_base.patch
 cfe8a050a1acc17c735c5af1b86989b38f99c14bbff509739523ede8768c2eab  libressl.patch
-b9f7e6e6d1f8135eda3e21da5e8ce6f6209d5ed053f6c3a09a241c0dc5b1c278  rust-std-1.84.0-x86_64-unknown-linux-musl.tar.xz
-f56165047145bdd606fe8cacfa6813f177baa39ffb96a6766c4c8fa9f14714a5  rustc-1.84.0-x86_64-unknown-linux-musl.tar.xz
-ce5f633a241667ec9b0b59d81bef63bcfdae3a0c3c28cb66913350c020070f02  rustc-1.85.1-src.tar.xz
+87d4ec8089bfcf5449bd8482e86ef668e2c4fd9fc52c3c374a11dd9d5f4dd79d  rust-std-1.85.0-x86_64-unknown-linux-musl.tar.xz
+30e6cc202b9ad0180fc66deebddc1232350ddc92b947c4430e55ad96638779ab  rustc-1.85.0-x86_64-unknown-linux-musl.tar.xz
+5bd02dd4e25b96b42a0c5b7ab25d51eb4db7760b412b4a5e2285237900d5a20b  rustc-1.86.0-src.tar.xz
diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files
index 6681a443..ba54e642 100644
--- a/repos/extra/rust/.files
+++ b/repos/extra/rust/.files
@@ -1,4 +1,6 @@
 drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/bash_completion.d/
+-rw-r--r-- root/root    etc/bash_completion.d/cargo.new
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/cargo
@@ -9,7 +11,7 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/rustc
 -rwxr-xr-x root/root    usr/bin/rustfmt
 drwxr-xr-x root/root    usr/lib/
--rw-r--r-- root/root    usr/lib/librustc_driver-af862eb6f848e0ba.so
+-rw-r--r-- root/root    usr/lib/librustc_driver-ec077a736098b7c9.so
 drwxr-xr-x root/root    usr/lib/rustlib/
 -rw-r--r-- root/root    usr/lib/rustlib/components
 drwxr-xr-x root/root    usr/lib/rustlib/etc/
@@ -28,29 +30,35 @@ drwxr-xr-x root/root    usr/lib/rustlib/etc/
 -rw-r--r-- root/root    usr/lib/rustlib/rust-installer-version
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/
+drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/ld.lld
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/ld64.lld
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/lld-link
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/gcc-ld/wasm-ld
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-lld
 -rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-objcopy
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-94a677fcdb2b6cca.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-d412bdbd33b503aa.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-b227ed5a46b5a96f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-a55dfbce1370a5f0.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-eb1d29d9fc171f61.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-9284d6cbe4e1fd73.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-c5ea7a4d8a6049e4.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-bb73b6ec7015be55.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-20a6b88051ce24d9.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-9979755e1fa9a4c0.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-a4077b80d5e6a379.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-0c6a440ed32dc851.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-685beed673b15a3d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-5e03bc2802dff73c.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-6183d1752282edb6.rlib
--rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-6183d1752282edb6.so
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-274de5eabb30db4a.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-30f8a46e65199f14.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-dbb8c33040095572.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-f2a55241911ca71d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-9ffb1d07f31c5004.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-66473c445db0d96e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-a28a9935a2376220.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-3025226cf35b05ba.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-6acc777b98105ee7.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-d3d886d159004024.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-476504b7edc442ca.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-709a512bd0ec6991.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-828d553676bc43d8.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-326d2a6890423ce0.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-ee316e6ba2710fea.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-124217ca77b8bce2.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-f80ae5f99e24eb68.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-e49a838c15547764.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-2deb468abe17876e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-8d3f7a219b301f21.rlib
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-8d3f7a219b301f21.so
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-7ddfbab6c2b7a4e1.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-7cc2119d20423e4c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-e6e5d4072440b539.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-ba9d1d0316c73c0e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-92b74b12ed259709.rlib
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/Scrt1.o
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crt1.o
diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild
index 7c1269b0..8c4d918d 100644
--- a/repos/extra/rust/abuild
+++ b/repos/extra/rust/abuild
@@ -1,9 +1,9 @@
 name=rust
-version=1.85.1
+version=1.86.0
 
 ##cat src/stage0.txt
-export _date=2025-01-09
-export _rustc=1.84.0
+export _date=2025-02-20
+export _rustc=1.85.0
 export _cargo=$_rustc
 ##
 
@@ -29,13 +29,16 @@ build() {
 	
 	sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.52+curl-7.81.0/.cargo-checksum.json
-	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.74+curl-8.9.0/.cargo-checksum.json
+	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.78+curl-8.11.0/.cargo-checksum.json
+	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.79+curl-8.12.0/.cargo-checksum.json
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.92/.cargo-checksum.json
 	
 	cat > config.toml <<EOF
 [llvm]
 link-shared      = true
 download-ci-llvm = false
+static-libstdcpp = false
+use-libcxx       = true
 
 [build]
 build     = "$_tuplet"
@@ -78,7 +81,14 @@ incremental       = false
 jemalloc          = false
 rpath             = false
 dist-src          = false
+llvm-libunwind    = "system"
 EOF
+
+	mkdir -p libgcc
+	printf 'INPUT(-lunwind)\n' > libgcc/libgcc_s.so
+	ln -sf $(cc -print-file-name=libunwind.so) libgcc/libgcc_s.so.1
+	export LD_LIBRARY_PATH="$PWD/libgcc:$LD_LIBRARY_PATH"
+	export LIBRARY_PATH="$PWD/libgcc:$LIBRARY_PATH"
 	
 	mkdir "$SRC/rust"
 	export RUST_BACKTRACE=1
@@ -88,6 +98,5 @@ EOF
 	
 	rm -rf $PKG/usr/lib/rustlib/src/ \
 		$PKG/usr/share/zsh \
-		$PKG/etc/bash_completion.d \
 		$PKG/usr/lib/rustlib/uninstall.sh
 }
diff --git a/repos/extra/rust/fix-bootstrap.patch b/repos/extra/rust/fix-bootstrap.patch
deleted file mode 100644
index 9d945932..00000000
--- a/repos/extra/rust/fix-bootstrap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index e706aba..35d69a6 100644
---- a/src/bootstrap/src/core/config/config.rs
-+++ b/src/bootstrap/src/core/config/config.rs
-@@ -2786,8 +2786,7 @@ impl Config {
- 
-         // If `download-rustc` is not set, default to rebuilding.
-         let if_unchanged = match download_rustc {
--            None => self.rust_info.is_managed_git_subrepository(),
--            Some(StringOrBool::Bool(false)) => return None,
-+            None | Some(StringOrBool::Bool(false)) => return None,
-             Some(StringOrBool::Bool(true)) => false,
-             Some(StringOrBool::String(s)) if s == "if-unchanged" => {
-                 if !self.rust_info.is_managed_git_subrepository() {
diff --git a/repos/extra/rust/fix-curl.patch b/repos/extra/rust/fix-curl.patch
index b1067b3d..b29c2794 100644
--- a/repos/extra/rust/fix-curl.patch
+++ b/repos/extra/rust/fix-curl.patch
@@ -11,11 +11,11 @@ index e9a2a42..560bfed 100644
          .define("CURL_DISABLE_DICT", None)
          .define("CURL_DISABLE_GOPHER", None)
          .define("CURL_DISABLE_IMAP", None)
-diff --git a/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs b/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs
-index 7d9a661..683354e 100644
---- a/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs
-+++ b/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs
-@@ -109,6 +109,8 @@ fn main() {
+diff --git a/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs b/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
+index a451b24..363b314 100644
+--- a/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
++++ b/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
+@@ -117,6 +117,8 @@ fn main() {
          .include("curl/lib")
          .include("curl/include")
          .define("BUILDING_LIBCURL", None)
@@ -24,10 +24,10 @@ index 7d9a661..683354e 100644
          .define("CURL_DISABLE_DICT", None)
          .define("CURL_DISABLE_GOPHER", None)
          .define("CURL_DISABLE_IMAP", None)
-diff --git a/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs b/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
-index a451b24..363b314 100644
---- a/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
-+++ b/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
+diff --git a/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs b/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs
+index 8315a20..98dedb4 100644
+--- a/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs
++++ b/vendor/curl-sys-0.4.79+curl-8.12.0/build.rs
 @@ -117,6 +117,8 @@ fn main() {
          .include("curl/lib")
          .include("curl/include")