diff options
author | Stephan Hartmann <sultan@gentoo.org> | 2022-02-03 10:18:31 +0100 |
---|---|---|
committer | Stephan Hartmann <sultan@gentoo.org> | 2022-02-03 10:18:31 +0100 |
commit | 079c473b3379b07537213a34f039d87a7ae791a7 (patch) | |
tree | bf0908b954e083b75b89ac6ede8c8e5ba53a1f4b /www-client | |
parent | www-client/chromium: security cleanup (diff) | |
download | gentoo-079c473b3379b07537213a34f039d87a7ae791a7.tar.gz gentoo-079c473b3379b07537213a34f039d87a7ae791a7.tar.bz2 gentoo-079c473b3379b07537213a34f039d87a7ae791a7.zip |
www-client/chromium: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/files/chromium-96-EnumTable-crash.patch | 76 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-97-arm64-mte-clang.patch | 34 |
2 files changed, 0 insertions, 110 deletions
diff --git a/www-client/chromium/files/chromium-96-EnumTable-crash.patch b/www-client/chromium/files/chromium-96-EnumTable-crash.patch deleted file mode 100644 index 9736739c8224..000000000000 --- a/www-client/chromium/files/chromium-96-EnumTable-crash.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h -index aad9e08..2f3fcad 100644 ---- a/components/cast_channel/enum_table.h -+++ b/components/cast_channel/enum_table.h -@@ -8,6 +8,7 @@ - #include <cstdint> - #include <cstring> - #include <ostream> -+#include <vector> - - #include "base/check_op.h" - #include "base/macros.h" -@@ -188,7 +189,6 @@ class - inline constexpr GenericEnumTableEntry(int32_t value); - inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str); - -- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete; - GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete; - - private: -@@ -254,7 +254,6 @@ class EnumTable { - constexpr Entry(E value, base::StringPiece str) - : GenericEnumTableEntry(static_cast<int32_t>(value), str) {} - -- Entry(const Entry&) = delete; - Entry& operator=(const Entry&) = delete; - }; - -@@ -313,15 +312,14 @@ class EnumTable { - if (is_sorted_) { - const std::size_t index = static_cast<std::size_t>(value); - if (ANALYZER_ASSUME_TRUE(index < data_.size())) { -- const auto& entry = data_.begin()[index]; -+ const auto& entry = data_[index]; - if (ANALYZER_ASSUME_TRUE(entry.has_str())) - return entry.str(); - } - return absl::nullopt; - } - return GenericEnumTableEntry::FindByValue( -- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), -- data_.size(), static_cast<int32_t>(value)); -+ &data_[0], data_.size(), static_cast<int32_t>(value)); - } - - // This overload of GetString is designed for cases where the argument is a -@@ -349,8 +347,7 @@ class EnumTable { - // enum value directly. - absl::optional<E> GetEnum(base::StringPiece str) const { - auto* entry = GenericEnumTableEntry::FindByString( -- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), -- data_.size(), str); -+ &data_[0], data_.size(), str); - return entry ? static_cast<E>(entry->value) : absl::optional<E>(); - } - -@@ -365,7 +362,7 @@ class EnumTable { - // Align the data on a cache line boundary. - alignas(64) - #endif -- std::initializer_list<Entry> data_; -+ const std::vector<Entry> data_; - bool is_sorted_; - - constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted) -@@ -377,8 +374,8 @@ class EnumTable { - - for (std::size_t i = 0; i < data.size(); i++) { - for (std::size_t j = i + 1; j < data.size(); j++) { -- const Entry& ei = data.begin()[i]; -- const Entry& ej = data.begin()[j]; -+ const Entry& ei = data[i]; -+ const Entry& ej = data[j]; - DCHECK(ei.value != ej.value) - << "Found duplicate enum values at indices " << i << " and " << j; - DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str())) diff --git a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch b/www-client/chromium/files/chromium-97-arm64-mte-clang.patch deleted file mode 100644 index e86110bfb0ea..000000000000 --- a/www-client/chromium/files/chromium-97-arm64-mte-clang.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c04406585217092f85f3188dab4875b7be78af1d Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Thu, 02 Dec 2021 16:56:39 +0000 -Subject: [PATCH] base: enable mte via -Xclang instead - --march is fragile as it may get overridden later on by -e.g. distributors. - -Bug: 1137393 -Change-Id: Ia6b98491ef6f955929d0699e9f435844de48e1da -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3310965 -Reviewed-by: Kentaro Hara <haraken@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -Cr-Commit-Position: refs/heads/main@{#947530} ---- - -diff --git a/base/BUILD.gn b/base/BUILD.gn -index df6293d..eaa02b7 100644 ---- a/base/BUILD.gn -+++ b/base/BUILD.gn -@@ -104,7 +104,12 @@ - # but they're not backwards compatible. Use base::CPU::has_mte() - # beforehand to confirm or use indirect functions (ifuncs) to select - # an MTE-specific implementation at dynamic link-time. -- cflags = [ "-march=armv8-a+memtag" ] -+ cflags = [ -+ "-Xclang", -+ "-target-feature", -+ "-Xclang", -+ "+mte", -+ ] - } - } - |