summaryrefslogtreecommitdiff
path: root/etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch
diff options
context:
space:
mode:
authorPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-10-29 14:26:00 +0100
committerPaul Cristian Sarbu <paul.cristian.sarbu@huawei.com>2024-10-30 14:03:09 +0100
commitc4504809bfa1455b4f5c2a651e7ad8f37804ea99 (patch)
tree17ae57c844cc65153e9afdc234eac8ded636d8a8 /etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch
parent4dcf66d4d00ca0b718e2b8c1ec8f56f1c0910a09 (diff)
downloadjustbuild-c4504809bfa1455b4f5c2a651e7ad8f37804ea99.tar.gz
Update to grpc v1.67.1
Update also direct dependencies: - boringssl b8b3e6e - google_apis fe8ba05 - protobuf v27.2 Also update the bootstrap build description for crypto library. Remove ssl patch for gcc-14 build as fix is now in upstream. Remove bytestream.proto patch as fix is now in upstream. Target utf8_range now taken only from protobuf, where it is first defined. For now, upb dependencies in grpc still taken from its own third_party subdirectory, as it is still kept synchronized with the corresponding tree in the corresponding protobuf version.
Diffstat (limited to 'etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch')
-rw-r--r--etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch74
1 files changed, 0 insertions, 74 deletions
diff --git a/etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch b/etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch
deleted file mode 100644
index fea564c8..00000000
--- a/etc/patches/crypto-use-_Generic-only-if-defined-__cplusplus.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3359a87a71307336100b84e66b69bad385cd3cfc Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@gmail.com>
-Date: Mon, 6 May 2024 01:36:39 +0200
-Subject: [PATCH] crypto: use _Generic only if !defined(__cplusplus)
-
-* fixes build with gcc-14 which has __builtin_addc and __builtin_subc
- with gcc-13 it was already using the #else branch because of missing builtins
-
-* fixes
- https://github.com/grpc/grpc/issues/35945
-
-* _Generic was introduced in boringssl with:
- https://boringssl.googlesource.com/boringssl/+/70ca6bc24be103dabd68e448cd3af29b929b771d%5E%21/#F4
-
-* but e.g. third_party/boringssl-with-bazel/src/ssl/d1_both.cc includes
- this internal.h and from the .cc extension gcc will process it as C++
- where _Generic isn't available, causing:
-
-In file included from third_party/boringssl-with-bazel/src/ssl/d1_both.cc:125:
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h: In function 'uint32_t CRYPTO_addc_u32(uint32_t, uint32_t, uint32_t, uint32_t*)':
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1159:7: error: expected primary-expression before 'unsigned'
- 1159 | unsigned: __builtin_addc, \
- | ^~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
- 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
- | ^~~~~~~~~~~~~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1160:7: error: expected primary-expression before 'unsigned'
- 1160 | unsigned long: __builtin_addcl, \
- | ^~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
- 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
- | ^~~~~~~~~~~~~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1161:7: error: expected primary-expression before 'unsigned'
- 1161 | unsigned long long: __builtin_addcll))((x), (y), (carry), (out_carry))
- | ^~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
- 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
- | ^~~~~~~~~~~~~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1158:4: error: '_Generic' was not declared in this scope
- 1158 | (_Generic((x), \
- | ^~~~~~~~
-third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC'
- 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry);
- | ^~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
----
-Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)]
-
- crypto/internal.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/crypto/internal.h b/crypto/internal.h
-index a77102d76..30d6826dd 100644
---- a/crypto/internal.h
-+++ b/crypto/internal.h
-@@ -1152,7 +1152,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) {
-
- // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry
- // bit. |carry| must be zero or one.
--#if OPENSSL_HAS_BUILTIN(__builtin_addc)
-+#if OPENSSL_HAS_BUILTIN(__builtin_addc) && !defined(__cplusplus)
-
- #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \
- (_Generic((x), \
-@@ -1204,7 +1204,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry,
-
- // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow
- // bit. |borrow| must be zero or one.
--#if OPENSSL_HAS_BUILTIN(__builtin_subc)
-+#if OPENSSL_HAS_BUILTIN(__builtin_subc) && !defined(__cplusplus)
-
- #define CRYPTO_GENERIC_SUBC(x, y, borrow, out_borrow) \
- (_Generic((x), \