View | Details | Raw Unified | Return to bug 45499
Collapse All | Expand All

(-)MySQL-8.0.36.orig/cmake/build_configurations/compiler_options.cmake (-6 / +6 lines)
Lines 64-75 Link Here
64
    SET(COMMON_CXX_FLAGS             "-std=c++17 -fno-omit-frame-pointer")
64
    SET(COMMON_CXX_FLAGS             "-std=c++17 -fno-omit-frame-pointer")
65
  ENDIF()
65
  ENDIF()
66
66
67
  # Faster TLS model
67
#  # Faster TLS model
68
  IF(MY_COMPILER_IS_GNU_OR_CLANG
68
#  IF(MY_COMPILER_IS_GNU_OR_CLANG
69
      AND NOT SOLARIS AND NOT LINUX_RHEL6 AND NOT LINUX_ALPINE)
69
#      AND NOT SOLARIS AND NOT LINUX_RHEL6 AND NOT LINUX_ALPINE)
70
    STRING_APPEND(COMMON_C_FLAGS     " -ftls-model=initial-exec")
70
#    STRING_APPEND(COMMON_C_FLAGS     " -ftls-model=initial-exec")
71
    STRING_APPEND(COMMON_CXX_FLAGS   " -ftls-model=initial-exec")
71
#    STRING_APPEND(COMMON_CXX_FLAGS   " -ftls-model=initial-exec")
72
  ENDIF()
72
#  ENDIF()
73
73
74
  # Use STRING_PREPEND here, so command-line input can override our defaults.
74
  # Use STRING_PREPEND here, so command-line input can override our defaults.
75
  STRING_PREPEND(CMAKE_C_FLAGS                  "${COMMON_C_FLAGS} ")
75
  STRING_PREPEND(CMAKE_C_FLAGS                  "${COMMON_C_FLAGS} ")

Return to bug 45499