diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-09 13:40:08 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-12-09 13:40:08 -0500 |
| commit | 2ed1d2cfa3f209e9db2e8aa25411f87f3e4889b3 (patch) | |
| tree | a21208078758154523ff6a5fe2fde21864838c5b | |
| parent | 3d1a939af18140957c39f0192cf197b5bb5ab480 (diff) | |
| parent | b35926e2606272ceac4191b207f51c531e0116a8 (diff) | |
| download | cmake-2ed1d2cfa3f209e9db2e8aa25411f87f3e4889b3.tar.gz | |
Merge branch 'backport-3.15-toc_on_ppc' into release-3.15
Merge-request: !4122
| -rw-r--r-- | CompileFlags.cmake | 12 | ||||
| -rw-r--r-- | Source/Modules/CheckCXXLinkerFlag.cmake | 25 |
2 files changed, 35 insertions, 2 deletions
diff --git a/CompileFlags.cmake b/CompileFlags.cmake index 91f2adffe1..053259f47c 100644 --- a/CompileFlags.cmake +++ b/CompileFlags.cmake @@ -54,12 +54,20 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc") endif() # Workaround for TOC Overflow on ppc64 +set(bigTocFlag "") if(CMAKE_SYSTEM_NAME STREQUAL "AIX" AND CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-bbigtoc") + set(bigTocFlag "-Wl,-bbigtoc") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-multi-toc") + set(bigTocFlag "-Wl,--no-multi-toc") +endif() +if(bigTocFlag) + include(CheckCXXLinkerFlag) + check_cxx_linker_flag(${bigTocFlag} BIG_TOC_FLAG_SUPPORTED) + if(BIG_TOC_FLAG_SUPPORTED) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${bigTocFlag}") + endif() endif() if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND diff --git a/Source/Modules/CheckCXXLinkerFlag.cmake b/Source/Modules/CheckCXXLinkerFlag.cmake new file mode 100644 index 0000000000..9ad2ad6309 --- /dev/null +++ b/Source/Modules/CheckCXXLinkerFlag.cmake @@ -0,0 +1,25 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +include_guard(GLOBAL) +include(CheckCXXSourceCompiles) +include(CMakeCheckCompilerFlagCommonPatterns) + +function(check_cxx_linker_flag _flag _var) + set(CMAKE_REQUIRED_LIBRARIES "${_flag}") + + # Normalize locale during test compilation. + set(_locale_vars LC_ALL LC_MESSAGES LANG) + foreach(v IN LISTS _locale_vars) + set(_locale_vars_saved_${v} "$ENV{${v}}") + set(ENV{${v}} C) + endforeach() + check_compiler_flag_common_patterns(_common_patterns) + check_cxx_source_compiles("int main() { return 0; }" ${_var} + ${_common_patterns} + ) + foreach(v IN LISTS _locale_vars) + set(ENV{${v}} ${_locale_vars_saved_${v}}) + endforeach() + set(${_var} "${${_var}}" PARENT_SCOPE) +endfunction() |