1 |
commit: 079c473b3379b07537213a34f039d87a7ae791a7 |
2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 3 09:18:31 2022 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 3 09:18:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079c473b |
7 |
|
8 |
www-client/chromium: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
12 |
|
13 |
.../files/chromium-96-EnumTable-crash.patch | 76 ---------------------- |
14 |
.../files/chromium-97-arm64-mte-clang.patch | 34 ---------- |
15 |
2 files changed, 110 deletions(-) |
16 |
|
17 |
diff --git a/www-client/chromium/files/chromium-96-EnumTable-crash.patch b/www-client/chromium/files/chromium-96-EnumTable-crash.patch |
18 |
deleted file mode 100644 |
19 |
index 9736739c8224..000000000000 |
20 |
--- a/www-client/chromium/files/chromium-96-EnumTable-crash.patch |
21 |
+++ /dev/null |
22 |
@@ -1,76 +0,0 @@ |
23 |
-diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h |
24 |
-index aad9e08..2f3fcad 100644 |
25 |
---- a/components/cast_channel/enum_table.h |
26 |
-+++ b/components/cast_channel/enum_table.h |
27 |
-@@ -8,6 +8,7 @@ |
28 |
- #include <cstdint> |
29 |
- #include <cstring> |
30 |
- #include <ostream> |
31 |
-+#include <vector> |
32 |
- |
33 |
- #include "base/check_op.h" |
34 |
- #include "base/macros.h" |
35 |
-@@ -188,7 +189,6 @@ class |
36 |
- inline constexpr GenericEnumTableEntry(int32_t value); |
37 |
- inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str); |
38 |
- |
39 |
-- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete; |
40 |
- GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete; |
41 |
- |
42 |
- private: |
43 |
-@@ -254,7 +254,6 @@ class EnumTable { |
44 |
- constexpr Entry(E value, base::StringPiece str) |
45 |
- : GenericEnumTableEntry(static_cast<int32_t>(value), str) {} |
46 |
- |
47 |
-- Entry(const Entry&) = delete; |
48 |
- Entry& operator=(const Entry&) = delete; |
49 |
- }; |
50 |
- |
51 |
-@@ -313,15 +312,14 @@ class EnumTable { |
52 |
- if (is_sorted_) { |
53 |
- const std::size_t index = static_cast<std::size_t>(value); |
54 |
- if (ANALYZER_ASSUME_TRUE(index < data_.size())) { |
55 |
-- const auto& entry = data_.begin()[index]; |
56 |
-+ const auto& entry = data_[index]; |
57 |
- if (ANALYZER_ASSUME_TRUE(entry.has_str())) |
58 |
- return entry.str(); |
59 |
- } |
60 |
- return absl::nullopt; |
61 |
- } |
62 |
- return GenericEnumTableEntry::FindByValue( |
63 |
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), |
64 |
-- data_.size(), static_cast<int32_t>(value)); |
65 |
-+ &data_[0], data_.size(), static_cast<int32_t>(value)); |
66 |
- } |
67 |
- |
68 |
- // This overload of GetString is designed for cases where the argument is a |
69 |
-@@ -349,8 +347,7 @@ class EnumTable { |
70 |
- // enum value directly. |
71 |
- absl::optional<E> GetEnum(base::StringPiece str) const { |
72 |
- auto* entry = GenericEnumTableEntry::FindByString( |
73 |
-- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), |
74 |
-- data_.size(), str); |
75 |
-+ &data_[0], data_.size(), str); |
76 |
- return entry ? static_cast<E>(entry->value) : absl::optional<E>(); |
77 |
- } |
78 |
- |
79 |
-@@ -365,7 +362,7 @@ class EnumTable { |
80 |
- // Align the data on a cache line boundary. |
81 |
- alignas(64) |
82 |
- #endif |
83 |
-- std::initializer_list<Entry> data_; |
84 |
-+ const std::vector<Entry> data_; |
85 |
- bool is_sorted_; |
86 |
- |
87 |
- constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted) |
88 |
-@@ -377,8 +374,8 @@ class EnumTable { |
89 |
- |
90 |
- for (std::size_t i = 0; i < data.size(); i++) { |
91 |
- for (std::size_t j = i + 1; j < data.size(); j++) { |
92 |
-- const Entry& ei = data.begin()[i]; |
93 |
-- const Entry& ej = data.begin()[j]; |
94 |
-+ const Entry& ei = data[i]; |
95 |
-+ const Entry& ej = data[j]; |
96 |
- DCHECK(ei.value != ej.value) |
97 |
- << "Found duplicate enum values at indices " << i << " and " << j; |
98 |
- DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str())) |
99 |
|
100 |
diff --git a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch b/www-client/chromium/files/chromium-97-arm64-mte-clang.patch |
101 |
deleted file mode 100644 |
102 |
index e86110bfb0ea..000000000000 |
103 |
--- a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch |
104 |
+++ /dev/null |
105 |
@@ -1,34 +0,0 @@ |
106 |
-From c04406585217092f85f3188dab4875b7be78af1d Mon Sep 17 00:00:00 2001 |
107 |
-From: Stephan Hartmann <stha09@××××××××××.com> |
108 |
-Date: Thu, 02 Dec 2021 16:56:39 +0000 |
109 |
-Subject: [PATCH] base: enable mte via -Xclang instead |
110 |
- |
111 |
--march is fragile as it may get overridden later on by |
112 |
-e.g. distributors. |
113 |
- |
114 |
-Bug: 1137393 |
115 |
-Change-Id: Ia6b98491ef6f955929d0699e9f435844de48e1da |
116 |
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3310965 |
117 |
-Reviewed-by: Kentaro Hara <haraken@××××××××.org> |
118 |
-Commit-Queue: Stephan Hartmann <stha09@××××××××××.com> |
119 |
-Cr-Commit-Position: refs/heads/main@{#947530} |
120 |
---- |
121 |
- |
122 |
-diff --git a/base/BUILD.gn b/base/BUILD.gn |
123 |
-index df6293d..eaa02b7 100644 |
124 |
---- a/base/BUILD.gn |
125 |
-+++ b/base/BUILD.gn |
126 |
-@@ -104,7 +104,12 @@ |
127 |
- # but they're not backwards compatible. Use base::CPU::has_mte() |
128 |
- # beforehand to confirm or use indirect functions (ifuncs) to select |
129 |
- # an MTE-specific implementation at dynamic link-time. |
130 |
-- cflags = [ "-march=armv8-a+memtag" ] |
131 |
-+ cflags = [ |
132 |
-+ "-Xclang", |
133 |
-+ "-target-feature", |
134 |
-+ "-Xclang", |
135 |
-+ "+mte", |
136 |
-+ ] |
137 |
- } |
138 |
- } |
139 |
- |