diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-04-23 10:45:28 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2023-04-23 10:45:28 -0400 |
| commit | d92f571cc96e10d74f49068c5c83b89f762cd373 (patch) | |
| tree | bb957519505e9313fb4d1a0dc9396db62f8bda8f /www-client/chromium/files | |
| parent | net-irc/ircii: restore parallel install workaround (diff) | |
| download | gentoo-d92f571cc96e10d74f49068c5c83b89f762cd373.tar.gz gentoo-d92f571cc96e10d74f49068c5c83b89f762cd373.tar.bz2 gentoo-d92f571cc96e10d74f49068c5c83b89f762cd373.zip | |
www-client/chromium: update swiftshader patch
Closes: https://bugs.gentoo.org/904850
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'www-client/chromium/files')
| -rw-r--r-- | www-client/chromium/files/chromium-112-swiftshader.patch | 52 |
1 files changed, 50 insertions, 2 deletions
diff --git a/www-client/chromium/files/chromium-112-swiftshader.patch b/www-client/chromium/files/chromium-112-swiftshader.patch index 5f703d919555..9d67841a1dea 100644 --- a/www-client/chromium/files/chromium-112-swiftshader.patch +++ b/www-client/chromium/files/chromium-112-swiftshader.patch @@ -1,4 +1,5 @@ https://bugs.gentoo.org/904725 +https://bugs.gentoo.org/904850 From 451fb9470e4e1cd183ff05d5e171dc21bae6e47c Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz <jdapena@igalia.com> @@ -29,8 +30,6 @@ Tested-by: Shahbaz Youssefi <syoussefi@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@google.com> --- -diff --git a/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h b/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h -index 620209b..d0a48e8 100644 --- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h +++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/ADT/STLExtras.h @@ -1415,9 +1415,9 @@ @@ -72,3 +71,52 @@ index 620209b..d0a48e8 100644 Result = Other.Result; return *this; } +From e4dea744b7838470757f010fc2ff4b92f02b3fac Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Thu, 16 Mar 2023 13:29:54 +0100 +Subject: [PATCH] More C++20 fixes + +Partial backport of llvm-project patch: + commit 2ccf0b76bcaf0895e04f14e3ff53c59dd96f9f0f + Author: Evgeny Mandrikov <mandrikov@gmail.com> + Date: Thu Jan 6 17:01:05 2022 +0100 + + Fix build failure with GCC 11 in C++20 mode + + See https://wg21.link/cwg2237 + + Reviewed By: shafik, dexonsmith + + Differential Revision: https://reviews.llvm.org/D115355 + +Bug: chromium:819294 +Change-Id: I90d58b6fc601f9a4f615e2f6edc13a73ce848e4f +Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71089 +Reviewed-by: Shahbaz Youssefi <syoussefi@google.com> +Tested-by: Shahbaz Youssefi <syoussefi@google.com> +Kokoro-Result: kokoro <noreply+kokoro@google.com> +Commit-Queue: Shahbaz Youssefi <syoussefi@google.com> +--- + +--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h ++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/CodeGen/LiveInterval.h +@@ -718,7 +718,7 @@ + T *P; + + public: +- SingleLinkedListIterator<T>(T *P) : P(P) {} ++ SingleLinkedListIterator(T *P) : P(P) {} + + SingleLinkedListIterator<T> &operator++() { + P = P->Next; +--- a/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h ++++ b/third_party/swiftshader/third_party/llvm-10.0/llvm/include/llvm/Support/BinaryStreamArray.h +@@ -324,7 +324,7 @@ + FixedStreamArrayIterator(const FixedStreamArray<T> &Array, uint32_t Index) + : Array(Array), Index(Index) {} + +- FixedStreamArrayIterator<T>(const FixedStreamArrayIterator<T> &Other) ++ FixedStreamArrayIterator(const FixedStreamArrayIterator<T> &Other) + : Array(Other.Array), Index(Other.Index) {} + FixedStreamArrayIterator<T> & + operator=(const FixedStreamArrayIterator<T> &Other) { |