thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded changes

Browse Source 
Fix GCC build
This commit is contained in:
Denis Glazachev 2021-04-10 23:23:18 +04:00
parent 429dc9da21
commit 5e8fe847a2
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/darwin/default_libs.cmake
View File

@ -4,6 +4,9 @@ set (DEFAULT_LIBS "${DEFAULT_LIBS} ${COVERAGE_OPTION} -lc -lm -lpthread -ldl")
if (COMPILER_GCC) if (COMPILER_GCC)
set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc_eh") set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc_eh")
if (ARCH_AARCH64)
set (DEFAULT_LIBS "${DEFAULT_LIBS} -lgcc")
endif ()
endif () endif ()
message(STATUS "Default libraries: ${DEFAULT_LIBS}") message(STATUS "Default libraries: ${DEFAULT_LIBS}")

5
src/CMakeLists.txt
View File

@ -515,8 +515,3 @@ if (ENABLE_TESTS AND USE_GTEST)
add_check(unit_tests_dbms) add_check(unit_tests_dbms)
endif () endif ()
if (OS_DARWIN AND ARCH_AARCH64)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crc+crypto")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto")
endif()

2
src/Common/tests/gtest_DateLUTImpl.cpp
View File

@ -20,8 +20,6 @@ extern const char * auto_time_zones[];
namespace namespace
{ {
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DateLUTWithTimeZoneAndTimeRange);
cctz::civil_day YYYYMMDDToDay(unsigned value) cctz::civil_day YYYYMMDDToDay(unsigned value)
{ {
return cctz::civil_day( return cctz::civil_day(

3
src/Parsers/New/AST/Identifier.cpp
View File

@ -142,16 +142,19 @@ antlrcpp::Any ParseTreeVisitor::visitIdentifierOrNull(ClickHouseParser::Identifi
antlrcpp::Any ParseTreeVisitor::visitInterval(ClickHouseParser::IntervalContext *) antlrcpp::Any ParseTreeVisitor::visitInterval(ClickHouseParser::IntervalContext *)
{ {
asm (""); // prevent symbol removal
__builtin_unreachable(); __builtin_unreachable();
} }
antlrcpp::Any ParseTreeVisitor::visitKeyword(ClickHouseParser::KeywordContext *) antlrcpp::Any ParseTreeVisitor::visitKeyword(ClickHouseParser::KeywordContext *)
{ {
asm (""); // prevent symbol removal
__builtin_unreachable(); __builtin_unreachable();
} }
antlrcpp::Any ParseTreeVisitor::visitKeywordForAlias(ClickHouseParser::KeywordForAliasContext *) antlrcpp::Any ParseTreeVisitor::visitKeywordForAlias(ClickHouseParser::KeywordForAliasContext *)
{ {
asm (""); // prevent symbol removal
__builtin_unreachable(); __builtin_unreachable();
} }