From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44E5F158087 for ; Thu, 3 Feb 2022 09:18:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88E542BC003; Thu, 3 Feb 2022 09:18:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F340F2BC003 for ; Thu, 3 Feb 2022 09:18:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24C10343276 for ; Thu, 3 Feb 2022 09:18:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4036268 for ; Thu, 3 Feb 2022 09:18:49 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1643879911.079c473b3379b07537213a34f039d87a7ae791a7.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/files/chromium-96-EnumTable-crash.patch www-client/chromium/files/chromium-97-arm64-mte-clang.patch X-VCS-Directories: www-client/chromium/files/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: 079c473b3379b07537213a34f039d87a7ae791a7 X-VCS-Branch: master Date: Thu, 3 Feb 2022 09:18:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1efd0aa7-e3f5-470c-ae7c-fcbb99ef0c7f X-Archives-Hash: 9b29928ebe9f317af348508863eb40a4 commit: 079c473b3379b07537213a34f039d87a7ae791a7 Author: Stephan Hartmann gentoo org> AuthorDate: Thu Feb 3 09:18:31 2022 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Thu Feb 3 09:18:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079c473b www-client/chromium: remove unused patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Stephan Hartmann gentoo.org> .../files/chromium-96-EnumTable-crash.patch | 76 ---------------------- .../files/chromium-97-arm64-mte-clang.patch | 34 ---------- 2 files changed, 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 - #include - #include -+#include - - #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(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(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(data_.begin()), -- data_.size(), static_cast(value)); -+ &data_[0], data_.size(), static_cast(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 GetEnum(base::StringPiece str) const { - auto* entry = GenericEnumTableEntry::FindByString( -- reinterpret_cast(data_.begin()), -- data_.size(), str); -+ &data_[0], data_.size(), str); - return entry ? static_cast(entry->value) : absl::optional(); - } - -@@ -365,7 +362,7 @@ class EnumTable { - // Align the data on a cache line boundary. - alignas(64) - #endif -- std::initializer_list data_; -+ const std::vector data_; - bool is_sorted_; - - constexpr EnumTable(std::initializer_list 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 -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 -Commit-Queue: Stephan Hartmann -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", -+ ] - } - } -