From 143d09575b3e4c26cecebb9deb6c3cc48445804f Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 18 Dec 2021 16:57:08 -0500 Subject: [PATCH 18/21] Revert "Bug #30981914: COMPILE WITH FASTER TLS MODEL" xref: https://github.com/conda-forge/mysql-feedstock/issues/60 xref: https://bugs.launchpad.net/ubuntu/+source/mysql-8.0/+bug/1889851 This reverts commit 735bd2a53834266c7256830c8d34672ea55fe17b. --- cmake/build_configurations/compiler_options.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake index d2bee7e2e40..7578dc7cc59 100644 --- a/cmake/build_configurations/compiler_options.cmake +++ b/cmake/build_configurations/compiler_options.cmake @@ -64,12 +64,6 @@ IF(UNIX) SET(COMMON_CXX_FLAGS "-std=c++17 -fno-omit-frame-pointer") ENDIF() - # Faster TLS model - IF(MY_COMPILER_IS_GNU_OR_CLANG AND NOT SOLARIS AND NOT LINUX_RHEL6) - STRING_APPEND(COMMON_C_FLAGS " -ftls-model=initial-exec") - STRING_APPEND(COMMON_CXX_FLAGS " -ftls-model=initial-exec") - ENDIF() - # Use STRING_PREPEND here, so command-line input can override our defaults. STRING_PREPEND(CMAKE_C_FLAGS "${COMMON_C_FLAGS} ") STRING_PREPEND(CMAKE_C_FLAGS_RELWITHDEBINFO "${SECTIONS_FLAG} ") -- 2.41.0