diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-01-07 20:31:03 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-01-07 20:31:03 +0000 |
| commit | 9bf259581c8877014b96b488ef7de5885bea692c (patch) | |
| tree | 387a01f0d3b4dd4382714dc9375f4a84a17a6d69 | |
| parent | d81f3c96599580f2a728bfe7e41b87639ecb7bb0 (diff) | |
| download | bcm5719-llvm-9bf259581c8877014b96b488ef7de5885bea692c.tar.gz bcm5719-llvm-9bf259581c8877014b96b488ef7de5885bea692c.zip | |
Don't use -O3 on Mingw, as people report it as unreliable. Use -O2
instead.
llvm-svn: 123028
| -rw-r--r-- | llvm/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | llvm/cmake/modules/LLVMProcessSources.cmake | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 3f48b58f438..5e27c6f82e4 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -317,6 +317,12 @@ if( MINGW ) set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}${LLVM_SYSTEM_LIBS}") endif() +if( MINGW ) + # People report that -O3 is unreliable on MinGW. The traditional + # build also uses -O2 for that reason: + llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") +endif() + add_subdirectory(lib/Support) # Everything else depends on Support: diff --git a/llvm/cmake/modules/LLVMProcessSources.cmake b/llvm/cmake/modules/LLVMProcessSources.cmake index 5f59eac4511..98b61296db4 100644 --- a/llvm/cmake/modules/LLVMProcessSources.cmake +++ b/llvm/cmake/modules/LLVMProcessSources.cmake @@ -1,5 +1,15 @@ include(AddFileDependencies) +macro(llvm_replace_compiler_option var old new) + # Replaces a compiler option or switch `old' in `var' by `new'. + # If `old' is not in `var', appends `new' to `var'. + # Example: llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") + if( "${${var}}" MATCHES "(^| )${old}($| )" ) + string( REGEX REPLACE "(^| )${old}($| )" " ${new} " ${var} "${${var}}" ) + else() + set( ${var} "${${var}} ${new}" ) + endif() +endmacro(llvm_replace_compiler_option) macro(add_td_sources srcs) file(GLOB tds *.td) |
