Skip to content

ARROW-18080: [C++] Remove gcc <= 4.9 workarounds #14441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 3 commits into from
Oct 19, 2022
Merged

ARROW-18080: [C++] Remove gcc <= 4.9 workarounds #14441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
453ade9
Remove a bunch of checks for old gcc
nealrichardson Oct 17, 2022
408a1e7
Revert conanfile changes
nealrichardson Oct 18, 2022
cfc33dd
Fix cmake formatting
nealrichardson Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions cpp/cmake_modules/SetupCxxFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,22 +400,13 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CXX_ONLY_FLAGS "${CXX_ONLY_FLAGS} -Wno-noexcept-type")
endif()

if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.2")
# Disabling semantic interposition allows faster calling conventions
# when calling global functions internally, and can also help inlining.
# See https://stackoverflow.com/questions/35745543/new-option-in-gcc-5-3-fno-semantic-interposition
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -fno-semantic-interposition")
endif()

if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.9")
# Add colors when paired with ninja
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
endif()
# Disabling semantic interposition allows faster calling conventions
# when calling global functions internally, and can also help inlining.
# See https://stackoverflow.com/questions/35745543/new-option-in-gcc-5-3-fno-semantic-interposition
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -fno-semantic-interposition")

if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0")
# Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43407
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-attributes")
endif()
# Add colors when paired with ninja
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")

if(CMAKE_UNITY_BUILD)
# Work around issue similar to https://bugs.webkit.org/show_bug.cgi?id=176869
Expand Down Expand Up @@ -507,18 +498,12 @@ if(ARROW_CPU_FLAG STREQUAL "armv8")

add_definitions(-DARROW_HAVE_NEON)

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"5.4")
message(WARNING "Disable Armv8 CRC and Crypto as compiler doesn't support them well."
)
else()
if(ARROW_ARMV8_ARCH_FLAG MATCHES "\\+crypto")
add_definitions(-DARROW_HAVE_ARMV8_CRYPTO)
endif()
# armv8.1+ implies crc support
if(ARROW_ARMV8_ARCH_FLAG MATCHES "armv8\\.[1-9]|\\+crc")
add_definitions(-DARROW_HAVE_ARMV8_CRC)
endif()
if(ARROW_ARMV8_ARCH_FLAG MATCHES "\\+crypto")
add_definitions(-DARROW_HAVE_ARMV8_CRYPTO)
endif()
# armv8.1+ implies crc support
if(ARROW_ARMV8_ARCH_FLAG MATCHES "armv8\\.[1-9]|\\+crc")
add_definitions(-DARROW_HAVE_ARMV8_CRC)
endif()
elseif(NOT ARROW_SIMD_LEVEL STREQUAL "NONE")
message(WARNING "ARROW_SIMD_LEVEL=${ARROW_SIMD_LEVEL} not supported by Arm.")
Expand Down
19 changes: 3 additions & 16 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,18 +652,9 @@ endif()
if(DEFINED ENV{ARROW_SNAPPY_URL})
set(SNAPPY_SOURCE_URL "$ENV{ARROW_SNAPPY_URL}")
else()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"4.9")
# There is a bug in GCC < 4.9 with Snappy 1.1.9, so revert to 1.1.8 "SNAPPY_OLD" for those (ARROW-14661)
set_urls(SNAPPY_SOURCE_URL
"https://github.com/google/snappy/archive/${ARROW_SNAPPY_OLD_BUILD_VERSION}.tar.gz"
"${THIRDPARTY_MIRROR_URL}/snappy-${ARROW_SNAPPY_OLD_BUILD_VERSION}.tar.gz")
set(ARROW_SNAPPY_BUILD_SHA256_CHECKSUM ${ARROW_SNAPPY_OLD_BUILD_SHA256_CHECKSUM})
else()
set_urls(SNAPPY_SOURCE_URL
"https://github.com/google/snappy/archive/${ARROW_SNAPPY_BUILD_VERSION}.tar.gz"
"${THIRDPARTY_MIRROR_URL}/snappy-${ARROW_SNAPPY_BUILD_VERSION}.tar.gz")
endif()
set_urls(SNAPPY_SOURCE_URL
"https://github.com/google/snappy/archive/${ARROW_SNAPPY_BUILD_VERSION}.tar.gz"
"${THIRDPARTY_MIRROR_URL}/snappy-${ARROW_SNAPPY_BUILD_VERSION}.tar.gz")
endif()

if(DEFINED ENV{ARROW_SUBSTRAIT_URL})
Expand Down Expand Up @@ -4584,10 +4575,6 @@ endif()

macro(build_awssdk)
message(STATUS "Building AWS C++ SDK from source")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"4.9")
message(FATAL_ERROR "AWS C++ SDK requires gcc >= 4.9")
endif()
set(AWSSDK_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/awssdk_ep-install")
set(AWSSDK_INCLUDE_DIR "${AWSSDK_PREFIX}/include")
set(AWSSDK_LIB_DIR "lib")
Expand Down
9 changes: 0 additions & 9 deletions cpp/src/arrow/dataset/file_parquet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,16 +742,7 @@ Result<std::optional<int64_t>> ParquetFileFragment::TryCountRows(
compute::Expression predicate) {
DCHECK_NE(metadata_, nullptr);
if (ExpressionHasFieldRefs(predicate)) {
#if defined(__GNUC__) && (__GNUC__ < 5)
// ARROW-12694: with GCC 4.9 (RTools 35) we sometimes segfault here if we move(result)
auto result = TestRowGroups(std::move(predicate));
if (!result.ok()) {
return result.status();
}
auto expressions = result.ValueUnsafe();
#else
ARROW_ASSIGN_OR_RAISE(auto expressions, TestRowGroups(std::move(predicate)));
#endif
int64_t rows = 0;
for (size_t i = 0; i < row_groups_->size(); i++) {
// If the row group is entirely excluded, exclude it from the row count
Expand Down
3 changes: 0 additions & 3 deletions cpp/thirdparty/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ ARROW_RE2_BUILD_SHA256_CHECKSUM=f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd
# 1.1.9 is patched to implement https://github.com/google/snappy/pull/148 if this is bumped, remove the patch
ARROW_SNAPPY_BUILD_VERSION=1.1.9
ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7
# There is a bug in GCC < 4.9 with Snappy 1.1.9, so revert to 1.1.8 for those (ARROW-14661)
ARROW_SNAPPY_OLD_BUILD_VERSION=1.1.8
ARROW_SNAPPY_OLD_BUILD_SHA256_CHECKSUM=16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f
ARROW_SUBSTRAIT_BUILD_VERSION=v0.6.0
ARROW_SUBSTRAIT_BUILD_SHA256_CHECKSUM=7b8583b9684477e9027f417bbfb4febb8acfeb01923dcaa7cf0fd3f921d69c88
ARROW_THRIFT_BUILD_VERSION=0.16.0
Expand Down