diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch | 75 |
2 files changed, 0 insertions, 101 deletions
diff --git a/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch b/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch deleted file mode 100644 index f6dee77ab2..0000000000 --- a/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 3b7e611bd58ba842470d17374c550e14bceca5c7 Mon Sep 17 00:00:00 2001 | ||
2 | From: serge-sans-paille <sguelton@redhat.com> | ||
3 | Date: Tue, 10 Nov 2020 14:55:25 +0100 | ||
4 | Subject: [PATCH] [nfc] Fix missing include | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | llvm/utils/benchmark/src/benchmark_register.h | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h | ||
13 | index 0705e219f2fa..4caa5ad4da07 100644 | ||
14 | --- a/llvm/utils/benchmark/src/benchmark_register.h | ||
15 | +++ b/llvm/utils/benchmark/src/benchmark_register.h | ||
16 | @@ -1,6 +1,7 @@ | ||
17 | #ifndef BENCHMARK_REGISTER_H | ||
18 | #define BENCHMARK_REGISTER_H | ||
19 | |||
20 | +#include <limits> | ||
21 | #include <vector> | ||
22 | |||
23 | #include "check.h" | ||
24 | -- | ||
25 | 2.30.1 | ||
26 | |||
diff --git a/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch b/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch deleted file mode 100644 index 13d81eaa37..0000000000 --- a/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From dd682cb48c8b667859dded98a4bbfbd891a1eca4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | ||
3 | Date: Thu, 12 Nov 2020 19:16:59 +0300 | ||
4 | Subject: [PATCH] rustc_target: Fix dash vs underscore mismatches in option | ||
5 | names | ||
6 | |||
7 | --- | ||
8 | compiler/rustc_target/src/spec/mod.rs | 16 ++++++++-------- | ||
9 | 1 file changed, 8 insertions(+), 8 deletions(-) | ||
10 | |||
11 | diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs | ||
12 | index f949bf95a50..f837114ee74 100644 | ||
13 | --- a/compiler/rustc_target/src/spec/mod.rs | ||
14 | +++ b/compiler/rustc_target/src/spec/mod.rs | ||
15 | @@ -1428,8 +1428,8 @@ pub fn from_json(obj: Json) -> Result<Target, String> { | ||
16 | } | ||
17 | |||
18 | key!(is_builtin, bool); | ||
19 | - key!(endian = "target_endian"); | ||
20 | - key!(c_int_width = "target_c_int_width"); | ||
21 | + key!(endian = "target-endian"); | ||
22 | + key!(c_int_width = "target-c-int-width"); | ||
23 | key!(os); | ||
24 | key!(env); | ||
25 | key!(vendor); | ||
26 | @@ -1466,7 +1466,7 @@ pub fn from_json(obj: Json) -> Result<Target, String> { | ||
27 | key!(exe_suffix); | ||
28 | key!(staticlib_prefix); | ||
29 | key!(staticlib_suffix); | ||
30 | - key!(os_family = "target_family", optional); | ||
31 | + key!(os_family = "target-family", optional); | ||
32 | key!(abi_return_struct_as_int, bool); | ||
33 | key!(is_like_osx, bool); | ||
34 | key!(is_like_solaris, bool); | ||
35 | @@ -1511,7 +1511,7 @@ pub fn from_json(obj: Json) -> Result<Target, String> { | ||
36 | key!(limit_rdylib_exports, bool); | ||
37 | key!(override_export_symbols, opt_list); | ||
38 | key!(merge_functions, MergeFunctions)?; | ||
39 | - key!(mcount = "target_mcount"); | ||
40 | + key!(mcount = "target-mcount"); | ||
41 | key!(llvm_abiname); | ||
42 | key!(relax_elf_relocations, bool); | ||
43 | key!(llvm_args, list); | ||
44 | @@ -1663,8 +1663,8 @@ fn to_json(&self) -> Json { | ||
45 | target_val!(data_layout); | ||
46 | |||
47 | target_option_val!(is_builtin); | ||
48 | - target_option_val!(endian, "target_endian"); | ||
49 | - target_option_val!(c_int_width, "target_c_int_width"); | ||
50 | + target_option_val!(endian, "target-endian"); | ||
51 | + target_option_val!(c_int_width, "target-c-int-width"); | ||
52 | target_option_val!(os); | ||
53 | target_option_val!(env); | ||
54 | target_option_val!(vendor); | ||
55 | @@ -1701,7 +1701,7 @@ fn to_json(&self) -> Json { | ||
56 | target_option_val!(exe_suffix); | ||
57 | target_option_val!(staticlib_prefix); | ||
58 | target_option_val!(staticlib_suffix); | ||
59 | - target_option_val!(os_family, "target_family"); | ||
60 | + target_option_val!(os_family, "target-family"); | ||
61 | target_option_val!(abi_return_struct_as_int); | ||
62 | target_option_val!(is_like_osx); | ||
63 | target_option_val!(is_like_solaris); | ||
64 | @@ -1746,7 +1746,7 @@ fn to_json(&self) -> Json { | ||
65 | target_option_val!(limit_rdylib_exports); | ||
66 | target_option_val!(override_export_symbols); | ||
67 | target_option_val!(merge_functions); | ||
68 | - target_option_val!(mcount, "target_mcount"); | ||
69 | + target_option_val!(mcount, "target-mcount"); | ||
70 | target_option_val!(llvm_abiname); | ||
71 | target_option_val!(relax_elf_relocations); | ||
72 | target_option_val!(llvm_args); | ||
73 | -- | ||
74 | 2.28.0 | ||
75 | |||