mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 09:07:26 -08:00
dev-cpp/abseil-cpp: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
parent
b1947cb2c5
commit
beeecb106a
@ -1,51 +0,0 @@
|
||||
Fixes compile failure with CUDA nvcc
|
||||
https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10
|
||||
https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235
|
||||
|
||||
From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001
|
||||
From: Abseil Team <absl-team@google.com>
|
||||
Date: Tue, 1 Feb 2022 13:52:49 -0800
|
||||
Subject: [PATCH] Export of internal Abseil changes
|
||||
|
||||
--
|
||||
121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro <dmauro@google.com>:
|
||||
|
||||
Internal change
|
||||
|
||||
PiperOrigin-RevId: 425707805
|
||||
|
||||
--
|
||||
0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro <dmauro@google.com>:
|
||||
|
||||
macOS CI: Avoid depending on external sites like GitHub by prepopulating
|
||||
dependencies and setting --distdir
|
||||
|
||||
Our Linux CI does this, but for some reason was never enabled on macOS
|
||||
|
||||
PiperOrigin-RevId: 425668638
|
||||
GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35
|
||||
Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea
|
||||
--- a/absl/container/internal/inlined_vector.h
|
||||
+++ b/absl/container/internal/inlined_vector.h
|
||||
@@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
|
||||
inlined_ptr->GetSize());
|
||||
}
|
||||
ABSL_INTERNAL_CATCH_ANY {
|
||||
- allocated_ptr->SetAllocation(
|
||||
- {allocated_storage_view.data, allocated_storage_view.capacity});
|
||||
+ allocated_ptr->SetAllocation(Allocation<A>{
|
||||
+ allocated_storage_view.data, allocated_storage_view.capacity});
|
||||
ABSL_INTERNAL_RETHROW;
|
||||
}
|
||||
|
||||
@@ -934,8 +934,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void {
|
||||
inlined_ptr->GetInlinedData(),
|
||||
inlined_ptr->GetSize());
|
||||
|
||||
- inlined_ptr->SetAllocation(
|
||||
- {allocated_storage_view.data, allocated_storage_view.capacity});
|
||||
+ inlined_ptr->SetAllocation(Allocation<A>{allocated_storage_view.data,
|
||||
+ allocated_storage_view.capacity});
|
||||
}
|
||||
|
||||
swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated());
|
||||
@ -1,22 +0,0 @@
|
||||
--- a/absl/strings/internal/string_constant.h
|
||||
+++ b/absl/strings/internal/string_constant.h
|
||||
@@ -35,12 +35,18 @@ namespace strings_internal {
|
||||
// below.
|
||||
template <typename T>
|
||||
struct StringConstant {
|
||||
+ private:
|
||||
+ static constexpr bool ValidateConstant(absl::string_view view) {
|
||||
+ return view.empty() || 2 * view[0] != 1;
|
||||
+ }
|
||||
+
|
||||
+public:
|
||||
static constexpr absl::string_view value = T{}();
|
||||
constexpr absl::string_view operator()() const { return value; }
|
||||
|
||||
// Check to be sure `view` points to constant data.
|
||||
// Otherwise, it can't be constant evaluated.
|
||||
- static_assert(value.empty() || 2 * value[0] != 1,
|
||||
+ static_assert(ValidateConstant(value),
|
||||
"The input string_view must point to constant data.");
|
||||
};
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c
|
||||
|
||||
From 36a4b073f1e7e02ed7d1ac140767e36f82f09b7c Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Fri, 27 May 2022 22:27:58 +0100
|
||||
Subject: [PATCH] absl/strings/internal/str_format/extension.h: add missing
|
||||
<stdint.h> include
|
||||
|
||||
Without the change absl-cpp build fails on this week's gcc-13 snapshot as:
|
||||
|
||||
/build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::'
|
||||
34 | enum class FormatConversionChar : uint8_t;
|
||||
| ^
|
||||
| ::
|
||||
--- a/absl/strings/internal/str_format/extension.h
|
||||
+++ b/absl/strings/internal/str_format/extension.h
|
||||
@@ -17,6 +17,7 @@
|
||||
#define ABSL_STRINGS_INTERNAL_STR_FORMAT_EXTENSION_H_
|
||||
|
||||
#include <limits.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstring>
|
||||
@ -1,18 +0,0 @@
|
||||
https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1
|
||||
|
||||
From 808bc202fc13e85a7948db0d7fb58f0f051200b1 Mon Sep 17 00:00:00 2001
|
||||
From: imaiguo <maaiguo@uniontech.com>
|
||||
Date: Wed, 23 Feb 2022 22:56:32 +0800
|
||||
Subject: [PATCH] Add support of loongarch64 (#1110)
|
||||
|
||||
--- a/absl/debugging/internal/examine_stack.cc
|
||||
+++ b/absl/debugging/internal/examine_stack.cc
|
||||
@@ -82,6 +82,8 @@ void* GetProgramCounter(void* vuc) {
|
||||
return reinterpret_cast<void*>(context->uc_mcontext.gregs[16]);
|
||||
#elif defined(__e2k__)
|
||||
return reinterpret_cast<void*>(context->uc_mcontext.cr0_hi);
|
||||
+#elif defined(__loongarch__)
|
||||
+ return reinterpret_cast<void*>(context->uc_mcontext.__pc);
|
||||
#else
|
||||
#error "Undefined Architecture."
|
||||
#endif
|
||||
@ -1,49 +0,0 @@
|
||||
https://bugs.gentoo.org/906218
|
||||
https://github.com/abseil/abseil-cpp/issues/1473
|
||||
https://github.com/abseil/abseil-cpp/commit/4500c2fada4e952037c59bd65e8be1ba0b29f21e
|
||||
|
||||
From 4500c2fada4e952037c59bd65e8be1ba0b29f21e Mon Sep 17 00:00:00 2001
|
||||
From: Derek Mauro <dmauro@google.com>
|
||||
Date: Mon, 12 Jun 2023 08:11:36 -0700
|
||||
Subject: [PATCH] DirectMmap: Use off_t instead of off64_t for the offset
|
||||
parameter
|
||||
|
||||
off_t is best for portability. Its size varies with the platform.
|
||||
off64_t is non-standard, but is present in glibc and some BSDs.
|
||||
It also matches the signature specified in the manual.
|
||||
https://man7.org/linux/man-pages/man2/mmap.2.html
|
||||
|
||||
This is a re-spin of #1349, but correctly casts the type to the type
|
||||
expected by the kernel for mmap2.
|
||||
https://man7.org/linux/man-pages/man2/mmap2.2.html
|
||||
|
||||
Fixes #1473
|
||||
|
||||
PiperOrigin-RevId: 539656313
|
||||
Change-Id: I7a30dd9d3eb6af03a99da0d93d721a86f6521b25
|
||||
---
|
||||
absl/base/internal/direct_mmap.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
|
||||
index 815b8d23ba3..1beb2ee4e52 100644
|
||||
--- a/absl/base/internal/direct_mmap.h
|
||||
+++ b/absl/base/internal/direct_mmap.h
|
||||
@@ -72,7 +72,7 @@ namespace base_internal {
|
||||
// Platform specific logic extracted from
|
||||
// https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h
|
||||
inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
|
||||
- off64_t offset) noexcept {
|
||||
+ off_t offset) noexcept {
|
||||
#if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
|
||||
defined(__m68k__) || defined(__sh__) || \
|
||||
(defined(__hppa__) && !defined(__LP64__)) || \
|
||||
@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
|
||||
#else
|
||||
return reinterpret_cast<void*>(
|
||||
syscall(SYS_mmap2, start, length, prot, flags, fd,
|
||||
- static_cast<off_t>(offset / pagesize)));
|
||||
+ static_cast<unsigned long>(offset / pagesize))); // NOLINT
|
||||
#endif
|
||||
#elif defined(__s390x__)
|
||||
// On s390x, mmap() arguments are passed in memory.
|
||||
@ -1,49 +0,0 @@
|
||||
Bug: https://bugs.gentoo.org/934337
|
||||
From: https://github.com/abseil/abseil-cpp/commit/c1e1b47d989978cde8c5a2a219df425b785a0c47.patch
|
||||
From c1e1b47d989978cde8c5a2a219df425b785a0c47 Mon Sep 17 00:00:00 2001
|
||||
From: Derek Mauro <dmauro@google.com>
|
||||
Date: Fri, 3 May 2024 09:14:22 -0700
|
||||
Subject: [PATCH] Use __builtin_ctzg and __builtin_clzg in the implementations
|
||||
of CountTrailingZeroesNonzero16 and CountLeadingZeroes16 when they are
|
||||
available.
|
||||
|
||||
GCC 14 and Clang 19 adds these new builtins. The g-suffix is for
|
||||
"generic". The s-suffix on __builtin_ctzs and __builtin_clzs is for
|
||||
"short". GCC never implemented the short versions and #1664 reports
|
||||
GCC 14 (pre-release) gives an error here, although this may be a
|
||||
pre-release bug.
|
||||
|
||||
Fixes #1664
|
||||
|
||||
PiperOrigin-RevId: 630408249
|
||||
Change-Id: I4aedcc82b85430f50d025f8eb1cab089c6fcd1bc
|
||||
---
|
||||
absl/numeric/internal/bits.h | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h
|
||||
index bfef06bce1f..0917464d6ad 100644
|
||||
--- a/absl/numeric/internal/bits.h
|
||||
+++ b/absl/numeric/internal/bits.h
|
||||
@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
|
||||
|
||||
ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int
|
||||
CountLeadingZeroes16(uint16_t x) {
|
||||
-#if ABSL_HAVE_BUILTIN(__builtin_clzs)
|
||||
+#if ABSL_HAVE_BUILTIN(__builtin_clzg)
|
||||
+ return x == 0 ? 16 : __builtin_clzg(x);
|
||||
+#elif ABSL_HAVE_BUILTIN(__builtin_clzs)
|
||||
static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int)
|
||||
"__builtin_clzs does not take 16-bit arg");
|
||||
return x == 0 ? 16 : __builtin_clzs(x);
|
||||
@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
|
||||
|
||||
ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
|
||||
CountTrailingZeroesNonzero16(uint16_t x) {
|
||||
-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
|
||||
+#if ABSL_HAVE_BUILTIN(__builtin_ctzg)
|
||||
+ return __builtin_ctzg(x);
|
||||
+#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)
|
||||
static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int)
|
||||
"__builtin_ctzs does not take 16-bit arg");
|
||||
return __builtin_ctzs(x);
|
||||
@ -1,33 +0,0 @@
|
||||
https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9
|
||||
|
||||
From: Christopher Fore <csfore@posteo.net>
|
||||
Date: Mon, 5 Aug 2024 10:48:19 -0400
|
||||
Subject: [PATCH] container/internal: Explicitly include <cstdint>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
GCC 15 will no longer include <cstdint> by default, resulting in build
|
||||
failures in projects that do not explicitly include it.
|
||||
|
||||
Error:
|
||||
absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type
|
||||
66 | assert(reinterpret_cast<uintptr_t>(p) % Alignment == 0 &&
|
||||
| ^~~~~~~~~
|
||||
absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
|
||||
30 | #include "absl/utility/utility.h"
|
||||
+++ |+#include <cstdint>
|
||||
31 |
|
||||
|
||||
See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
|
||||
Signed-off-by: Christopher Fore <csfore@posteo.net>
|
||||
--- a/absl/container/internal/container_memory.h
|
||||
+++ b/absl/container/internal/container_memory.h
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <cassert>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <memory>
|
||||
#include <new>
|
||||
@ -1,19 +0,0 @@
|
||||
https://github.com/abseil/abseil-cpp/issues/1528
|
||||
|
||||
From: Paul Zander <negril.nx+gentoo@gmail.com>
|
||||
Date: Sat, 7 Jul 2024 01:53:19 +0200
|
||||
Subject: [PATCH] remove abseil::random_internal_mock_overload_set
|
||||
See-Also: https://bugs.gentoo.org/935417
|
||||
|
||||
diff --git a/absl/random/CMakeLists.txt b/absl/random/CMakeLists.txt
|
||||
index bd363d8..7692a35 100644
|
||||
--- a/absl/random/CMakeLists.txt
|
||||
+++ b/absl/random/CMakeLists.txt
|
||||
@@ -112,7 +112,6 @@ absl_cc_library(
|
||||
absl::raw_logging_internal
|
||||
absl::random_distributions
|
||||
absl::random_internal_distribution_caller
|
||||
- absl::random_internal_mock_overload_set
|
||||
absl::random_random
|
||||
absl::strings
|
||||
absl::span
|
||||
Loading…
x
Reference in New Issue
Block a user