11From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22From: Kleis Auke Wolthuizen <github@kleisauke.nl>
33Date: Wed, 5 May 2021 21:00:00 +0200
4- Subject: [PATCH 1/4] Add llvm-mingw ARM/ARM64 targets
4+ Subject: [PATCH 1/4] Add llvm-mingw targets
55
6+ Upstream-Status: Inappropriate [enable feature]
7+ Upstream only accepts Rust targets that are available in stable releases.
68
79diff --git a/vendor/cfg-expr/src/targets/builtins.rs b/vendor/cfg-expr/src/targets/builtins.rs
810index 1111111..2222222 100644
@@ -13,7 +15,7 @@ index 1111111..2222222 100644
1315 endian: Endian::little,
1416 },
1517+ TargetInfo {
16- + triple: Triple::new_const("aarch64-pc-windows-gnu "),
18+ + triple: Triple::new_const("aarch64-pc-windows-gnullvm "),
1719+ os: Some(Os::windows),
1820+ arch: Arch::aarch64,
1921+ env: Some(Env::gnu),
@@ -30,7 +32,7 @@ index 1111111..2222222 100644
3032 endian: Endian::little,
3133 },
3234+ TargetInfo {
33- + triple: Triple::new_const("armv7-pc-windows-gnu "),
35+ + triple: Triple::new_const("armv7-pc-windows-gnullvm "),
3436+ os: Some(Os::windows),
3537+ arch: Arch::arm,
3638+ env: Some(Env::gnu),
@@ -42,6 +44,40 @@ index 1111111..2222222 100644
4244 TargetInfo {
4345 triple: Triple::new_const("armv7-unknown-freebsd"),
4446 os: Some(Os::freebsd),
47+ @@ -683,6 +703,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
48+ pointer_width: 32,
49+ endian: Endian::little,
50+ },
51+ + TargetInfo {
52+ + triple: Triple::new_const("i686-pc-windows-gnullvm"),
53+ + os: Some(Os::windows),
54+ + arch: Arch::x86,
55+ + env: Some(Env::gnu),
56+ + vendor: Some(Vendor::pc),
57+ + families: Families::windows,
58+ + pointer_width: 32,
59+ + endian: Endian::little,
60+ + },
61+ TargetInfo {
62+ triple: Triple::new_const("i686-pc-windows-msvc"),
63+ os: Some(Os::windows),
64+ @@ -1573,6 +1603,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
65+ pointer_width: 64,
66+ endian: Endian::little,
67+ },
68+ + TargetInfo {
69+ + triple: Triple::new_const("x86_64-pc-windows-gnullvm"),
70+ + os: Some(Os::windows),
71+ + arch: Arch::x86_64,
72+ + env: Some(Env::gnu),
73+ + vendor: Some(Vendor::pc),
74+ + families: Families::windows,
75+ + pointer_width: 64,
76+ + endian: Endian::little,
77+ + },
78+ TargetInfo {
79+ triple: Triple::new_const("x86_64-pc-windows-msvc"),
80+ os: Some(Os::windows),
4581
4682From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4783From: Kleis Auke Wolthuizen <github@kleisauke.nl>
@@ -52,6 +88,8 @@ Details:
5288lld-link: error: undefined symbol: __aeabi_idiv
5389>>> referenced by libcompiler_builtins-<HASH>.rlib(<O_FILE>):(__aeabi_idivmod)
5490
91+ Upstream-Status: Pending
92+
5593diff --git a/vendor/compiler_builtins/build.rs b/vendor/compiler_builtins/build.rs
5694index 1111111..2222222 100644
5795--- a/vendor/compiler_builtins/build.rs
@@ -73,6 +111,42 @@ Subject: [PATCH 3/4] Use appropriate fix/float aliases on llvm-mingw
73111
74112See: https://github.com/llvm/llvm-project/commit/e6407356ba008e474322d52b7d031f65fa4913fc
75113
114+ Details:
115+ ld.lld: error: duplicate symbol: __floatdisf
116+ >>> defined at libclang_rt.builtins-arm.a(floatdisf.c.obj)
117+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
118+
119+ ld.lld: error: duplicate symbol: __floatdidf
120+ >>> defined at libclang_rt.builtins-arm.a(floatdidf.c.obj)
121+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
122+
123+ ld.lld: error: duplicate symbol: __floatundisf
124+ >>> defined at libclang_rt.builtins-arm.a(floatundisf.c.obj)
125+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
126+
127+ ld.lld: error: duplicate symbol: __floatundidf
128+ >>> defined at libclang_rt.builtins-arm.a(floatundidf.c.obj)
129+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
130+
131+ ld.lld: error: duplicate symbol: __fixsfdi
132+ >>> defined at libclang_rt.builtins-arm.a(fixsfdi.c.obj)
133+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
134+
135+ ld.lld: error: duplicate symbol: __fixdfdi
136+ >>> defined at libclang_rt.builtins-arm.a(fixdfdi.c.obj)
137+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
138+
139+ ld.lld: error: duplicate symbol: __fixunssfdi
140+ >>> defined at libclang_rt.builtins-arm.a(fixunssfdi.c.obj)
141+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
142+
143+ ld.lld: error: duplicate symbol: __fixunsdfdi
144+ >>> defined at libclang_rt.builtins-arm.a(fixunsdfdi.c.obj)
145+ >>> defined at libcompiler_builtins-<HASH>.rlib(<O_FILE>)
146+
147+ Upstream-Status: Inappropriate [Windows specific]
148+ This is Windows specific and would break compatibility with other Rust ARMv7 targets.
149+
76150diff --git a/vendor/compiler_builtins/src/float/conv.rs b/vendor/compiler_builtins/src/float/conv.rs
77151index 1111111..2222222 100644
78152--- a/vendor/compiler_builtins/src/float/conv.rs
@@ -160,11 +234,13 @@ error[E0412]: cannot find type `DELAYLOAD_INFO` in this scope
1602342300 | ..._CALLBACK = ::core::option::Option<unsafe extern "system" fn(notificationreason: u32, delayloadinfo: *const DELAYLOAD_INFO) -> *mut ::...
161235 | - help: you might be missing a type parameter: `<DELAYLOAD_INFO>` ^^^^^^^^^^^^^^ not found in this scope
162236
237+ Upstream-Status: Pending
238+
163239diff --git a/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs b/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs
164240index 1111111..2222222 100644
165241--- a/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs
166242+++ b/vendor/windows-sys/src/Windows/Win32/System/WindowsProgramming/mod.rs
167- @@ -1353 ,7 +1353 ,7 @@ impl ::core::clone::Clone for DELAYLOAD_INFO {
243+ @@ -1352 ,7 +1352 ,7 @@ impl ::core::clone::Clone for DELAYLOAD_INFO {
168244 }
169245 #[repr(C)]
170246 #[doc = "*Required features: `\"Win32_System_WindowsProgramming\"`*"]
@@ -173,7 +249,7 @@ index 1111111..2222222 100644
173249 pub struct DELAYLOAD_INFO {
174250 pub Size: u32,
175251 pub DelayloadDescriptor: *mut IMAGE_DELAYLOAD_DESCRIPTOR,
176- @@ -1364 ,9 +1364 ,9 @@ pub struct DELAYLOAD_INFO {
252+ @@ -1363 ,9 +1363 ,9 @@ pub struct DELAYLOAD_INFO {
177253 pub Unused: *mut ::core::ffi::c_void,
178254 pub LastError: u32,
179255 }
0 commit comments