summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python3-grpcio
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-grpcio')
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch30
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch82
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch74
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch49
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch37
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch24
-rw-r--r--meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch18
7 files changed, 60 insertions, 254 deletions
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
deleted file mode 100644
index 5cd94dee9c..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 252aa78526287fe033c5656cd166e551fa5daa88 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 30 Jan 2023 10:31:10 -0800
4Subject: [PATCH] Include missing <cstdint> header
5
6gcc 13 moved some includes around and as a result <cstdint> is
7no longer transitively included [1]. Explicitly include it for
8int32_t.
9
10[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
11
12Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15---
16 third_party/re2/util/pcre.h | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h
20index 896b0bd..271a005 100644
21--- a/third_party/re2/util/pcre.h
22+++ b/third_party/re2/util/pcre.h
23@@ -163,6 +163,7 @@
24
25 #include "util/util.h"
26 #include "re2/stringpiece.h"
27+#include <cstdint>
28
29 #ifdef USEPCRE
30 #include <pcre.h>
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
deleted file mode 100644
index 82f15f88cd..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001
2From: aurel32 <aurelien@aurel32.net>
3Date: Fri, 22 Mar 2024 14:21:13 -0700
4Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support
5
6Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644
7
8Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear.
9
10The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2].
11
12Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units.
13
14This fixes the testsuite on riscv64, tested on a VisionFive 2 board.
15
16[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3
17[2] https://github.com/abseil/abseil-cpp/pull/1631
18Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1
19
20Merging this change closes #1644
21
22COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71
23PiperOrigin-RevId: 618286262
24Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652
25
26Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d]
27[Adapted to apply on top of meta-oe's patch stack]
28Signed-off-by: Scott Murray <scott.murray@konsulko.com>
29---
30 .../absl/base/internal/unscaledcycleclock.cc | 12 ------------
31 .../absl/base/internal/unscaledcycleclock_config.h | 5 ++---
32 2 files changed, 2 insertions(+), 15 deletions(-)
33
34diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
35index f11fecb..103b4f6 100644
36--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
37+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
38@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() {
39 return aarch64_timer_frequency;
40 }
41
42-#elif defined(__riscv)
43-
44-int64_t UnscaledCycleClock::Now() {
45- int64_t virtual_timer_value;
46- asm volatile("rdcycle %0" : "=r"(virtual_timer_value));
47- return virtual_timer_value;
48-}
49-
50-double UnscaledCycleClock::Frequency() {
51- return base_internal::NominalCPUFrequency();
52-}
53-
54 #elif defined(_M_IX86) || defined(_M_X64)
55
56 #pragma intrinsic(__rdtsc)
57diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
58index 5e232c1..83552fc 100644
59--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
60+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
61@@ -22,7 +22,6 @@
62 // The following platforms have an implementation of a hardware counter.
63 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
64 ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
65- defined(__riscv) || \
66 defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
67 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
68 #else
69@@ -54,8 +53,8 @@
70 #if ABSL_USE_UNSCALED_CYCLECLOCK
71 // This macro can be used to test if UnscaledCycleClock::Frequency()
72 // is NominalCPUFrequency() on a particular platform.
73-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \
74- defined(_M_IX86) || defined(_M_X64))
75+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
76+ defined(_M_X64))
77 #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
78 #endif
79 #endif
80--
812.44.0
82
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
deleted file mode 100644
index d830d92284..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 3359a87a71307336100b84e66b69bad385cd3cfc Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Mon, 6 May 2024 01:36:39 +0200
4Subject: [PATCH] crypto: use _Generic only if !defined(__cplusplus)
5
6* fixes build with gcc-14 which has __builtin_addc and __builtin_subc
7 with gcc-13 it was already using the #else branch because of missing builtins
8
9* fixes
10 https://github.com/grpc/grpc/issues/35945
11
12* _Generic was introduced in boringssl with:
13 https://boringssl.googlesource.com/boringssl/+/70ca6bc24be103dabd68e448cd3af29b929b771d%5E%21/#F4
14
15* but e.g. third_party/boringssl-with-bazel/src/ssl/d1_both.cc includes
16 this internal.h and from the .cc extension gcc will process it as C++
17 where _Generic isn't available, causing:
18
19In file included from third_party/boringssl-with-bazel/src/ssl/d1_both.cc:125:
20third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h: In function 'uint32_t CRYPTO_addc_u32(uint32_t, uint32_t, uint32_t, uint32_t*)':
21third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1159:7: error: expected primary-expression before 'unsigned'
22 1159 | unsigned: __builtin_addc, \
23 | ^~~~~~~~
24third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
25 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
26 | ^~~~~~~~~~~~~~~~~~~
27third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1160:7: error: expected primary-expression before 'unsigned'
28 1160 | unsigned long: __builtin_addcl, \
29 | ^~~~~~~~
30third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
31 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
32 | ^~~~~~~~~~~~~~~~~~~
33third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1161:7: error: expected primary-expression before 'unsigned'
34 1161 | unsigned long long: __builtin_addcll))((x), (y), (carry), (out_carry))
35 | ^~~~~~~~
36third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
37 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
38 | ^~~~~~~~~~~~~~~~~~~
39third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1158:4: error: '_Generic' was not declared in this scope
40 1158 | (_Generic((x), \
41 | ^~~~~~~~
42third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
43 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
44 | ^~~~~~~~~~~~~~~~~~~
45
46Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
47---
48Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)]
49
50 crypto/internal.h | 4 ++--
51 1 file changed, 2 insertions(+), 2 deletions(-)
52
53diff --git a/crypto/internal.h b/crypto/internal.h
54index a77102d76..30d6826dd 100644
55--- a/crypto/internal.h
56+++ b/crypto/internal.h
57@@ -1176,7 +1176,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
58
59 // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
60 // bit. |carry| must be zero or one.
61-#if OPENSSL_HAS_BUILTIN(__builtin_addc)
62+#if OPENSSL_HAS_BUILTIN(__builtin_addc) && !defined(__cplusplus)
63
64 #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \
65 (_Generic((x), \
66@@ -1228,7 +1228,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry,
67
68 // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow
69 // bit. |borrow| must be zero or one.
70-#if OPENSSL_HAS_BUILTIN(__builtin_subc)
71+#if OPENSSL_HAS_BUILTIN(__builtin_subc) && !defined(__cplusplus)
72
73 #define CRYPTO_GENERIC_SUBC(x, y, borrow, out_borrow) \
74 (_Generic((x), \
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch
new file mode 100644
index 0000000000..b2b2713559
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch
@@ -0,0 +1,49 @@
1From ed9f268774838d279e23b4ae9fb95ca7650942b2 Mon Sep 17 00:00:00 2001
2From: Peter Marko <peter.marko@siemens.com>
3Date: Wed, 5 Feb 2025 21:06:50 +0100
4Subject: [PATCH] python: enable unbundled cross compilation
5
6System headers are on a sysroot path provided by the toolchain
7options.
8
9Upstream-Status: Pending
10Signed-off-by: Peter Marko <peter.marko@siemens.com>
11---
12 setup.py | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-)
14
15diff --git a/setup.py b/setup.py
16index 4d13d87..f002ab2 100644
17--- a/setup.py
18+++ b/setup.py
19@@ -318,25 +318,25 @@ if BUILD_WITH_SYSTEM_OPENSSL:
20 lambda x: "third_party/boringssl" not in x, CORE_C_FILES
21 )
22 CORE_C_FILES = filter(lambda x: "src/boringssl" not in x, CORE_C_FILES)
23- SSL_INCLUDE = (os.path.join("/usr", "include", "openssl"),)
24+ SSL_INCLUDE = ()
25
26 if BUILD_WITH_SYSTEM_ZLIB:
27 CORE_C_FILES = filter(lambda x: "third_party/zlib" not in x, CORE_C_FILES)
28- ZLIB_INCLUDE = (os.path.join("/usr", "include"),)
29+ ZLIB_INCLUDE = ()
30
31 if BUILD_WITH_SYSTEM_CARES:
32 CORE_C_FILES = filter(lambda x: "third_party/cares" not in x, CORE_C_FILES)
33- CARES_INCLUDE = (os.path.join("/usr", "include"),)
34+ CARES_INCLUDE = ()
35
36 if BUILD_WITH_SYSTEM_RE2:
37 CORE_C_FILES = filter(lambda x: "third_party/re2" not in x, CORE_C_FILES)
38- RE2_INCLUDE = (os.path.join("/usr", "include", "re2"),)
39+ RE2_INCLUDE = ()
40
41 if BUILD_WITH_SYSTEM_ABSL:
42 CORE_C_FILES = filter(
43 lambda x: "third_party/abseil-cpp" not in x, CORE_C_FILES
44 )
45- ABSL_INCLUDE = (os.path.join("/usr", "include"),)
46+ ABSL_INCLUDE = ()
47
48 EXTENSION_INCLUDE_DIRECTORIES = (
49 (PYTHON_STEM,)
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch
deleted file mode 100644
index 0b512b1d00..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From b3bca013007a4a66703573d243e433f22e1e6684 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 15 May 2024 16:55:09 +0800
4Subject: [PATCH] target.h: define proper macro for ppc/ppc64
5
6Fix error:
7third_party/boringssl-with-bazel/src/include/openssl/target.h:74:2: error: #error "Unknown target CPU"
8third_party/boringssl-with-bazel/src/include/openssl/bn.h:172:2: error: #error "Must define either OPENSSL_32_BIT or OPENSSL_64_BIT"
9third_party/boringssl-with-bazel/src/include/openssl/bn.h:230:44: error: 'BN_ULONG' has not been declared
10
11BN_ULONG will be defined after set proper OPENSSL_32_BIT or OPENSSL_64_BIT
12
13Upstream-Status: Pending
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 third_party/boringssl-with-bazel/src/include/openssl/target.h | 4 ++++
18 1 file changed, 4 insertions(+)
19
20diff --git a/third_party/boringssl-with-bazel/src/include/openssl/target.h b/third_party/boringssl-with-bazel/src/include/openssl/target.h
21index 29b1dc6..d779813 100644
22--- a/third_party/boringssl-with-bazel/src/include/openssl/target.h
23+++ b/third_party/boringssl-with-bazel/src/include/openssl/target.h
24@@ -54,6 +54,10 @@
25 #define OPENSSL_32_BIT
26 #elif defined(__myriad2__)
27 #define OPENSSL_32_BIT
28+#elif defined(__PPC64__)
29+#define OPENSSL_64_BIT
30+#elif defined(__PPC__)
31+#define OPENSSL_32_BIT
32 #else
33 // The list above enumerates the platforms that BoringSSL supports. For these
34 // platforms we keep a reasonable bar of not breaking them: automated test
35--
362.25.1
37
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
deleted file mode 100644
index 34ef7874e8..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 671618df3e48619f0c7a5a3acd8982374a5e43db Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 12 Feb 2023 21:25:04 -0800
4Subject: [PATCH] zlib: Include unistd.h for open/close C APIs
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 third_party/zlib/gzguts.h | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h
14index f937504..341a68d 100644
15--- a/third_party/zlib/gzguts.h
16+++ b/third_party/zlib/gzguts.h
17@@ -18,6 +18,7 @@
18 #endif
19
20 #include <stdio.h>
21+#include <unistd.h>
22 #include "zlib.h"
23 #ifdef STDC
24 # include <string.h>
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
index f39a9616d9..69e06a7918 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
@@ -1,5 +1,5 @@
1From 102dcce6610e6606fffd3a4986f84eb52177f8c8 Mon Sep 17 00:00:00 2001 1From a2ec96a96ff7ba016e800212a942b9f29f255415 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 13 Mar 2021 10:26:25 -0800 3Date: Sat, 13 Mar 2021 10:26:25 -0800
4Subject: [PATCH] An all-in-one patch that fixes several issues: 4Subject: [PATCH] An all-in-one patch that fixes several issues:
5 5
@@ -13,6 +13,7 @@ Sourced from void linux
13Upstream-Status: Pending 13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> 15Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
16Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
16--- 17---
17 .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- 18 .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++--
18 .../absl/base/internal/unscaledcycleclock_config.h | 3 ++- 19 .../absl/base/internal/unscaledcycleclock_config.h | 3 ++-
@@ -21,7 +22,7 @@ Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
21 4 files changed, 12 insertions(+), 5 deletions(-) 22 4 files changed, 12 insertions(+), 5 deletions(-)
22 23
23diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc 24diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
24index 05e0e7b..f11fecb 100644 25index a0bf3a6..103b4f6 100644
25--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc 26--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
26+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc 27+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
27@@ -20,7 +20,7 @@ 28@@ -20,7 +20,7 @@
@@ -43,17 +44,17 @@ index 05e0e7b..f11fecb 100644
43 int64_t UnscaledCycleClock::Now() { 44 int64_t UnscaledCycleClock::Now() {
44 #ifdef __GLIBC__ 45 #ifdef __GLIBC__
45diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h 46diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
46index 24b324a..5e232c1 100644 47index 43a3dab..196a853 100644
47--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h 48--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
48+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h 49+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
49@@ -21,7 +21,8 @@ 50@@ -21,7 +21,8 @@
50 51
51 // The following platforms have an implementation of a hardware counter. 52 // The following platforms have an implementation of a hardware counter.
52 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ 53 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
53- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ 54- defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \
54+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ 55+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
55+ defined(__riscv) || \ 56+ defined(_M_IX86) || \
56 defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) 57 (defined(_M_X64) && !defined(_M_ARM64EC))
57 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 58 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
58 #else 59 #else
59diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc 60diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
@@ -96,3 +97,6 @@ index 3929b1b..23d5e50 100644
96 #define ABSL_STACKTRACE_INL_HEADER \ 97 #define ABSL_STACKTRACE_INL_HEADER \
97 "absl/debugging/internal/stacktrace_powerpc-inl.inc" 98 "absl/debugging/internal/stacktrace_powerpc-inl.inc"
98 #elif defined(__aarch64__) 99 #elif defined(__aarch64__)
100--
1012.43.0
102