-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Update librsvg to 2.57.1. - Update libxml2 to 2.12.3. - Update ImageMagick to 6.9.13-1.
- Loading branch information
Showing
6 changed files
with
46 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Wed, 5 May 2021 21:00:00 +0200 | ||
| Subject: [PATCH 1/4] Add llvm-mingw i686/ARMv7 targets | ||
| Subject: [PATCH 1/2] Add llvm-mingw i686/ARMv7 targets | ||
|
|
||
| Upstream-Status: Inappropriate [enable feature] | ||
| Upstream only accepts Rust targets that are available in stable releases. | ||
|
|
@@ -54,7 +54,7 @@ index 1111111..2222222 100644 | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Mon, 21 Sep 2020 11:00:00 +0200 | ||
| Subject: [PATCH 2/4] Fix linker error on `armv7-pc-windows-gnullvm` | ||
| Subject: [PATCH 2/2] Fix linker error on `armv7-pc-windows-gnullvm` | ||
|
|
||
| Details: | ||
| lld-link: error: undefined symbol: __aeabi_idiv | ||
|
|
@@ -75,225 +75,3 @@ index 1111111..2222222 100644 | |
| { | ||
| sources.extend(&[ | ||
| ("__aeabi_div0", "arm/aeabi_div0.c"), | ||
|
|
||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Tue, 15 Feb 2022 11:38:18 +0100 | ||
| Subject: [PATCH 3/4] Use appropriate fix/float aliases on llvm-mingw | ||
|
|
||
| See: https://github.com/llvm/llvm-project/commit/e6407356ba008e474322d52b7d031f65fa4913fc | ||
|
|
||
| Details: | ||
| ld.lld: error: duplicate symbol: __floatdisf | ||
| >>> defined at libclang_rt.builtins-arm.a(floatdisf.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __floatdidf | ||
| >>> defined at libclang_rt.builtins-arm.a(floatdidf.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __floatundisf | ||
| >>> defined at libclang_rt.builtins-arm.a(floatundisf.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __floatundidf | ||
| >>> defined at libclang_rt.builtins-arm.a(floatundidf.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __fixsfdi | ||
| >>> defined at libclang_rt.builtins-arm.a(fixsfdi.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __fixdfdi | ||
| >>> defined at libclang_rt.builtins-arm.a(fixdfdi.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __fixunssfdi | ||
| >>> defined at libclang_rt.builtins-arm.a(fixunssfdi.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| ld.lld: error: duplicate symbol: __fixunsdfdi | ||
| >>> defined at libclang_rt.builtins-arm.a(fixunsdfdi.c.obj) | ||
| >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>) | ||
|
|
||
| Upstream-Status: Inappropriate [Windows specific] | ||
| This is Windows specific and would break compatibility with other Rust ARMv7 targets. | ||
|
|
||
| diff --git a/vendor/compiler_builtins/src/float/conv.rs b/vendor/compiler_builtins/src/float/conv.rs | ||
| index 1111111..2222222 100644 | ||
| --- a/vendor/compiler_builtins/src/float/conv.rs | ||
| +++ b/vendor/compiler_builtins/src/float/conv.rs | ||
| @@ -82,12 +82,12 @@ intrinsics! { | ||
| f64::from_bits(int_to_float::u32_to_f64_bits(i)) | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_ul2f] | ||
| + #[arm_aeabi_alias = __u64tos] | ||
| pub extern "C" fn __floatundisf(i: u64) -> f32 { | ||
| f32::from_bits(int_to_float::u64_to_f32_bits(i)) | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_ul2d] | ||
| + #[arm_aeabi_alias = __u64tod] | ||
| pub extern "C" fn __floatundidf(i: u64) -> f64 { | ||
| f64::from_bits(int_to_float::u64_to_f64_bits(i)) | ||
| } | ||
| @@ -117,13 +117,13 @@ intrinsics! { | ||
| f64::from_bits(int_to_float::u32_to_f64_bits(i.unsigned_abs()) | sign_bit) | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_l2f] | ||
| + #[arm_aeabi_alias = __i64tos] | ||
| pub extern "C" fn __floatdisf(i: i64) -> f32 { | ||
| let sign_bit = ((i >> 63) as u32) << 31; | ||
| f32::from_bits(int_to_float::u64_to_f32_bits(i.unsigned_abs()) | sign_bit) | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_l2d] | ||
| + #[arm_aeabi_alias = __i64tod] | ||
| pub extern "C" fn __floatdidf(i: i64) -> f64 { | ||
| let sign_bit = ((i >> 63) as u64) << 63; | ||
| f64::from_bits(int_to_float::u64_to_f64_bits(i.unsigned_abs()) | sign_bit) | ||
| @@ -160,7 +160,7 @@ intrinsics! { | ||
| } | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_f2ulz] | ||
| + #[arm_aeabi_alias = __stou64] | ||
| pub extern "C" fn __fixunssfdi(f: f32) -> u64 { | ||
| let fbits = f.to_bits(); | ||
| if fbits < 127 << 23 { // >= 0, < 1 | ||
| @@ -208,7 +208,7 @@ intrinsics! { | ||
| } | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_d2ulz] | ||
| + #[arm_aeabi_alias = __dtou64] | ||
| pub extern "C" fn __fixunsdfdi(f: f64) -> u64 { | ||
| let fbits = f.to_bits(); | ||
| if fbits < 1023 << 52 { // >= 0, < 1 | ||
| @@ -260,7 +260,7 @@ intrinsics! { | ||
| } | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_f2lz] | ||
| + #[arm_aeabi_alias = __stoi64] | ||
| pub extern "C" fn __fixsfdi(f: f32) -> i64 { | ||
| let fbits = f.to_bits() & !0 >> 1; // Remove sign bit. | ||
| if fbits < 127 << 23 { // >= 0, < 1 | ||
| @@ -311,7 +311,7 @@ intrinsics! { | ||
| } | ||
| } | ||
|
|
||
| - #[arm_aeabi_alias = __aeabi_d2lz] | ||
| + #[arm_aeabi_alias = __dtoi64] | ||
| pub extern "C" fn __fixdfdi(f: f64) -> i64 { | ||
| let fbits = f.to_bits() & !0 >> 1; // Remove sign bit. | ||
| if fbits < 1023 << 52 { // >= 0, < 1 | ||
|
|
||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Sat, 30 Apr 2022 16:05:00 +0200 | ||
| Subject: [PATCH 4/4] Fix build errors on `armv7-pc-windows-gnullvm` | ||
|
|
||
| Details: | ||
| error[E0412]: cannot find type `WSADATA` in this scope | ||
| --> vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs:347:63 | ||
| | | ||
| 347 | pub fn WSAStartup(wversionrequested: u16, lpwsadata: *mut WSADATA) -> i32; | ||
| | ^^^^^^^ help: a struct with a similar name exists: `WSPDATA` | ||
| ... | ||
| 8679 | pub struct WSPDATA { | ||
| | ------------------ similarly named struct `WSPDATA` defined here | ||
|
|
||
| error[E0412]: cannot find type `SERVENT` in this scope | ||
| --> vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs:481:103 | ||
| | | ||
| 481 | pub fn getservbyname(name: ::windows_sys::core::PCSTR, proto: ::windows_sys::core::PCSTR) -> *mut SERVENT; | ||
| | ^^^^^^^ not found in this scope | ||
|
|
||
| error[E0412]: cannot find type `SERVENT` in this scope | ||
| --> vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs:483:80 | ||
| | | ||
| 483 | pub fn getservbyport(port: i32, proto: ::windows_sys::core::PCSTR) -> *mut SERVENT; | ||
| | ^^^^^^^ not found in this scope | ||
|
|
||
| error[E0412]: cannot find type `DELAYLOAD_INFO` in this scope | ||
| --> vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs:3241:140 | ||
| | | ||
| 3241 | ..._CALLBACK = ::core::option::Option<unsafe extern "system" fn(notificationreason: u32, delayloadinfo: *const DELAYLOAD_INFO) -> *mut ::... | ||
| | - help: you might be missing a type parameter: `<DELAYLOAD_INFO>` ^^^^^^^^^^^^^^ not found in this scope | ||
|
|
||
| Upstream-Status: Pending | ||
|
|
||
| diff --git a/vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs b/vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs | ||
| index 1111111..2222222 100644 | ||
| --- a/vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs | ||
| +++ b/vendor/windows-sys/src/Windows/Win32/Networking/WinSock/mod.rs | ||
| @@ -6619,16 +6619,16 @@ impl ::core::clone::Clone for SERVENT { | ||
| } | ||
| #[repr(C)] | ||
| #[doc = "*Required features: `\"Win32_Networking_WinSock\"`*"] | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| pub struct SERVENT { | ||
| pub s_name: ::windows_sys::core::PSTR, | ||
| pub s_aliases: *mut *mut i8, | ||
| pub s_port: i16, | ||
| pub s_proto: ::windows_sys::core::PSTR, | ||
| } | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| impl ::core::marker::Copy for SERVENT {} | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| impl ::core::clone::Clone for SERVENT { | ||
| fn clone(&self) -> Self { | ||
| *self | ||
| @@ -7860,7 +7860,7 @@ impl ::core::clone::Clone for WSADATA { | ||
| } | ||
| #[repr(C)] | ||
| #[doc = "*Required features: `\"Win32_Networking_WinSock\"`*"] | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| pub struct WSADATA { | ||
| pub wVersion: u16, | ||
| pub wHighVersion: u16, | ||
| @@ -7870,9 +7870,9 @@ pub struct WSADATA { | ||
| pub iMaxUdpDg: u16, | ||
| pub lpVendorInfo: ::windows_sys::core::PSTR, | ||
| } | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| impl ::core::marker::Copy for WSADATA {} | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| impl ::core::clone::Clone for WSADATA { | ||
| fn clone(&self) -> Self { | ||
| *self | ||
|
|
||
| diff --git a/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs b/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs | ||
| index 1111111..2222222 100644 | ||
| --- a/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs | ||
| +++ b/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs | ||
| @@ -2241,7 +2241,7 @@ impl ::core::clone::Clone for DELAYLOAD_INFO { | ||
| } | ||
| #[repr(C)] | ||
| #[doc = "*Required features: `\"Win32_System_WindowsProgramming\"`*"] | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| pub struct DELAYLOAD_INFO { | ||
| pub Size: u32, | ||
| pub DelayloadDescriptor: *mut IMAGE_DELAYLOAD_DESCRIPTOR, | ||
| @@ -2252,9 +2252,9 @@ pub struct DELAYLOAD_INFO { | ||
| pub Unused: *mut ::core::ffi::c_void, | ||
| pub LastError: u32, | ||
| } | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| impl ::core::marker::Copy for DELAYLOAD_INFO {} | ||
| -#[cfg(target_arch = "x86")] | ||
| +#[cfg(any(target_arch = "arm", target_arch = "x86"))] | ||
| impl ::core::clone::Clone for DELAYLOAD_INFO { | ||
| fn clone(&self) -> Self { | ||
| *self | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Tue, 15 Sep 2020 11:50:00 +0200 | ||
| Subject: [PATCH 1/4] Add `armv7-pc-windows-gnullvm` triple | ||
| Subject: [PATCH 1/5] Add `armv7-pc-windows-gnullvm` triple | ||
|
|
||
| Upstream-Status: Pending | ||
|
|
||
|
|
@@ -36,7 +36,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s | |
| index 1111111..2222222 100644 | ||
| --- a/compiler/rustc_target/src/spec/mod.rs | ||
| +++ b/compiler/rustc_target/src/spec/mod.rs | ||
| @@ -1592,6 +1592,7 @@ supported_targets! { | ||
| @@ -1595,6 +1595,7 @@ supported_targets! { | ||
| ("i686-uwp-windows-gnu", i686_uwp_windows_gnu), | ||
| ("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu), | ||
|
|
||
|
|
@@ -48,7 +48,7 @@ index 1111111..2222222 100644 | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Tue, 22 Sep 2020 10:00:00 +0200 | ||
| Subject: [PATCH 2/4] std/unwind: Fix linker errors on `armv7-pc-windows-gnullvm` | ||
| Subject: [PATCH 2/5] std/unwind: Fix linker errors on `armv7-pc-windows-gnullvm` | ||
|
|
||
| Details: | ||
| ld.lld: error: undefined symbol: __gnu_unwind_frame | ||
|
|
@@ -101,7 +101,7 @@ index 1111111..2222222 100644 | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Tue, 30 Aug 2022 23:20:27 +0200 | ||
| Subject: [PATCH 3/4] windows-gnullvm: Avoid linking to libunwind statically | ||
| Subject: [PATCH 3/5] windows-gnullvm: Avoid linking to libunwind statically | ||
|
|
||
| Avoid linking against the static variant of libunwind, which is not | ||
| always available. Instead, prefer to use the unwind library from the | ||
|
|
@@ -160,7 +160,7 @@ index 1111111..2222222 100644 | |
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Mon, 17 Oct 2022 11:50:00 +0200 | ||
| Subject: [PATCH 4/4] Use GCC-style unwinding on MinGW targets other than i686 | ||
| Subject: [PATCH 4/5] Use GCC-style unwinding on MinGW targets other than i686 | ||
|
|
||
| See: https://github.com/msys2/MINGW-packages/pull/13278 | ||
|
|
||
|
|
@@ -205,3 +205,27 @@ index 1111111..2222222 100644 | |
| // We declare these as opaque types. This is fine since you just need to | ||
| // pass them to _GCC_specific_handler and forget about them. | ||
| pub enum EXCEPTION_RECORD {} | ||
|
|
||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Kleis Auke Wolthuizen <[email protected]> | ||
| Date: Sun, 17 Dec 2023 11:52:24 +0100 | ||
| Subject: [PATCH 5/5] Don't consider weak symbols as built-in functions | ||
|
|
||
| See: https://github.com/rust-lang/rust/issues/118609 | ||
|
|
||
| Upstream-Status: Pending | ||
|
|
||
| diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs | ||
| index 1111111..2222222 100644 | ||
| --- a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs | ||
| +++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs | ||
| @@ -112,7 +112,8 @@ fn reachable_non_generics_provider(tcx: TyCtxt<'_>, _: LocalCrate) -> DefIdMap<S | ||
| let is_builtin_fn = is_compiler_builtins | ||
| && symbol_export_level(tcx, def_id.to_def_id()) | ||
| .is_below_threshold(SymbolExportLevel::C) | ||
| - && codegen_attrs.flags.contains(CodegenFnAttrFlags::NO_MANGLE); | ||
| + && codegen_attrs.flags.contains(CodegenFnAttrFlags::NO_MANGLE) | ||
| + && codegen_attrs.linkage != Some(rustc_middle::mir::mono::Linkage::WeakAny); | ||
| let used = name == "rust_eh_personality"; | ||
|
|
||
| let export_level = if special_runtime_crate { | ||
Oops, something went wrong.