From 269276c363e11ce1192c7e7850274225f183cb03 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Thu, 31 Jul 2025 11:55:38 +0200 Subject: [PATCH] Fix for bc10a249596066c0f483f08b21c16411812c22e6 As has been pointed out by fweimer, my last patch wasn't correct and this commit fixes that. Related: RHEL-104565 --- 0002-fix-__atomic_thread_fence-on-s390x.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0002-fix-__atomic_thread_fence-on-s390x.patch b/0002-fix-__atomic_thread_fence-on-s390x.patch index b96ed35..459c8f2 100644 --- a/0002-fix-__atomic_thread_fence-on-s390x.patch +++ b/0002-fix-__atomic_thread_fence-on-s390x.patch @@ -1,12 +1,12 @@ diff -Naur protobuf-3.5.0/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h protobuf-3.5.0_patched/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h --- protobuf-3.5.0/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h 2017-11-13 19:47:29.000000000 +0100 -+++ protobuf-3.5.0_patched/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h 2025-07-28 14:43:08.178230374 +0200 ++++ protobuf-3.5.0_patched/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h 2025-07-30 14:15:59.956298045 +0200 @@ -56,7 +56,7 @@ #if defined(__GLIBCXX__) // Work around libstdc++ bug 51038 where atomic_thread_fence was declared but // not defined, leading to the linker complaining about undefined references. - __atomic_thread_fence(std::memory_order_seq_cst); -+ __atomic_thread_fence((int)std::memory_order_seq_cst); ++ __atomic_thread_fence(__ATOMIC_SEQ_CST); #else std::atomic_thread_fence(std::memory_order_seq_cst); #endif