diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-11-10 17:26:35 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-11-10 17:26:35 +0000 |
| commit | 65b6e05454113626d816c6586ef95b3e0a4e3eaf (patch) | |
| tree | 239e46ab16095f490452d4b921fdf28099b4377f /cmake/Modules/CompilerRTDarwinUtils.cmake | |
| parent | 4b90f53e5e79ee3e5c12fa6868c476fb240809cc (diff) | |
[CMake] Cleaning up flags for Darwin builtins
* Setting CMAKE_*_FLAGS_${BUILD_TYPE} isn't really needed since we're setting the same value everywhere
* functions sanitize variables differently from macros, darwin_add_embedded_builtin_libraries should be a macro otherwise it won't alter the variables.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@252618 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules/CompilerRTDarwinUtils.cmake')
| -rw-r--r-- | cmake/Modules/CompilerRTDarwinUtils.cmake | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake index 7b61dc0ea..171950622 100644 --- a/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -255,16 +255,7 @@ endfunction() macro(darwin_add_builtin_libraries) set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes) - if(CMAKE_CONFIGURATION_TYPES) - foreach(type ${CMAKE_CONFIGURATION_TYPES}) - set(CMAKE_C_FLAGS_${type} -O3) - set(CMAKE_CXX_FLAGS_${type} -O3) - endforeach() - else() - set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} -O3) - endif() - - set(CMAKE_C_FLAGS "-fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer") + set(CMAKE_C_FLAGS "-O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer") set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS}) @@ -343,7 +334,7 @@ macro(darwin_add_builtin_libraries) darwin_add_embedded_builtin_libraries() endmacro() -function(darwin_add_embedded_builtin_libraries) +macro(darwin_add_embedded_builtin_libraries) # this is a hacky opt-out. If you can't target both intel and arm # architectures we bail here. set(DARWIN_SOFT_FLOAT_ARCHS armv6m armv7m armv7em armv7) @@ -363,16 +354,8 @@ function(darwin_add_embedded_builtin_libraries) endif() set(MACHO_SYM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/macho_embedded) - if(CMAKE_CONFIGURATION_TYPES) - foreach(type ${CMAKE_CONFIGURATION_TYPES}) - set(CMAKE_C_FLAGS_${type} -Oz) - set(CMAKE_CXX_FLAGS_${type} -Oz) - endforeach() - else() - set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} -Oz) - endif() - set(CMAKE_C_FLAGS "-Wall -fomit-frame-pointer -ffreestanding") + set(CMAKE_C_FLAGS "-Oz -Wall -fomit-frame-pointer -ffreestanding") set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS}) set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS}) @@ -390,8 +373,6 @@ function(darwin_add_embedded_builtin_libraries) ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_armv7em "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_armv7m "-target thumbv7-apple-darwin-eabi") set(CFLAGS_i386 "-march=pentium") darwin_read_list_from_file(common_FUNCTIONS ${MACHO_SYM_DIR}/common.txt) @@ -450,4 +431,4 @@ function(darwin_add_embedded_builtin_libraries) INSTALL_DIR ${DARWIN_macho_embedded_LIBRARY_INSTALL_DIR}) endforeach() endforeach() -endfunction() +endmacro() |