Skip to content

Commit 341fd36

Browse files
Copilotfruffy
andauthored
Update protobuf to 29.6 and remove abseil GCC >14 workarounds (#5550)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: fruffy <[email protected]>
1 parent f01f43a commit 341fd36

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

cmake/Abseil.cmake

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,10 @@ macro(p4c_obtain_abseil)
5454
# Do not suppress warnings for Abseil library targets that are aliased.
5555
get_target_property(target_type ${target} TYPE)
5656
if (NOT ${target_type} STREQUAL "INTERFACE_LIBRARY")
57-
# We need this workaround because of https://github.com/abseil/abseil-cpp/issues/1664.
58-
# TODO: Remove once the Abseil compilation issue is fixed.
59-
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
60-
target_compile_options(${target} PUBLIC "-mbmi")
61-
endif()
6257
target_compile_options(${target} PRIVATE "-Wno-error" "-w")
6358
endif()
6459
endif()
6560
endforeach()
66-
# TODO: Remove once the Abseil compilation issue is fixed.
67-
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
68-
message(WARNING "Compiling with GCC > 14. Adding -mbmi to Abseil targets, this may cause incompatibility with old CPUs.")
69-
endif()
70-
7161
# Reset temporary variable modifications.
7262
set(CMAKE_UNITY_BUILD ${CMAKE_UNITY_BUILD_PREV})
7363
set(FETCHCONTENT_QUIET ${FETCHCONTENT_QUIET_PREV})

cmake/Protobuf.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
macro(p4c_obtain_protobuf)
2-
set(P4C_PROTOBUF_VERSION 25.3)
2+
set(P4C_PROTOBUF_VERSION 29.6)
33
option(
44
P4C_USE_PREINSTALLED_PROTOBUF
55
"Look for a preinstalled version of Protobuf in the system instead of installing a prebuilt binary using FetchContent."
@@ -63,7 +63,7 @@ macro(p4c_obtain_protobuf)
6363
fetchcontent_declare(
6464
protobuf
6565
URL https://github.com/protocolbuffers/protobuf/releases/download/v${P4C_PROTOBUF_VERSION}/protobuf-${P4C_PROTOBUF_VERSION}.tar.gz
66-
URL_HASH SHA256=d19643d265b978383352b3143f04c0641eea75a75235c111cc01a1350173180e
66+
URL_HASH SHA256=877bf9f880631aa31daf2c09896276985696728137fcd43cc534a28c5566d9ba
6767
USES_TERMINAL_DOWNLOAD TRUE
6868
GIT_PROGRESS TRUE
6969
DOWNLOAD_EXTRACT_TIMESTAMP TRUE

0 commit comments

Comments
 (0)