[libc-commits] [libc] 36c36c1 - [libc] use llvm_update_compile_flags to populate rtti/exception compilation flags

[Guillaume Chatelet via libc-commits]

Author: Guillaume Chatelet
Date: 2022-02-02T13:36:30Z
New Revision: 36c36c1ee3b01b2d4a9e7ee12c9c23a98659e0fb

URL: https://github.com/llvm/llvm-project/commit/36c36c1ee3b01b2d4a9e7ee12c9c23a98659e0fb
DIFF: https://github.com/llvm/llvm-project/commit/36c36c1ee3b01b2d4a9e7ee12c9c23a98659e0fb.diff

LOG: [libc] use llvm_update_compile_flags to populate rtti/exception compilation flags

Added: 
    

Modified: 
    libc/benchmarks/CMakeLists.txt
    libc/benchmarks/automemcpy/lib/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libc/benchmarks/CMakeLists.txt b/libc/benchmarks/CMakeLists.txt
index 9e59927324197..50a5562b14daf 100644
--- a/libc/benchmarks/CMakeLists.txt
+++ b/libc/benchmarks/CMakeLists.txt
@@ -29,6 +29,7 @@ function(add_libc_benchmark_unittest target_name)
     gtest
     ${LIBC_BENCHMARKS_UNITTEST_DEPENDS}
   )
+  llvm_update_compile_flags(${target_name})
 
   add_custom_command(
     TARGET ${target_name}
@@ -58,6 +59,7 @@ target_link_libraries(libc-benchmark
     LLVMSupport
     Threads::Threads
 )
+llvm_update_compile_flags(libc-benchmark)
 
 add_libc_benchmark_unittest(libc-benchmark-test
     SRCS LibcBenchmarkTest.cpp
@@ -82,6 +84,7 @@ target_link_libraries(libc-memory-benchmark
     PUBLIC
     libc-benchmark
 )
+llvm_update_compile_flags(libc-memory-benchmark)
 
 add_libc_benchmark_unittest(libc-memory-benchmark-test
     SRCS LibcMemoryBenchmarkTest.cpp
@@ -96,6 +99,7 @@ add_library(json
     JSON.h
 )
 target_link_libraries(json PUBLIC libc-memory-benchmark)
+llvm_update_compile_flags(json)
 
 add_libc_benchmark_unittest(json-test
     SRCS JSONTest.cpp

diff  --git a/libc/benchmarks/automemcpy/lib/CMakeLists.txt b/libc/benchmarks/automemcpy/lib/CMakeLists.txt
index 073a92ae68ad0..0c7d399d4023b 100644
--- a/libc/benchmarks/automemcpy/lib/CMakeLists.txt
+++ b/libc/benchmarks/automemcpy/lib/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_library(automemcpy_codegen CodeGen.cpp)
 target_link_libraries(automemcpy_codegen PUBLIC LLVMSupport)
-target_compile_options(automemcpy_codegen PUBLIC -fno-rtti)
 target_include_directories(automemcpy_codegen PUBLIC ${LIBC_AUTOMEMCPY_INCLUDE_DIR})
+llvm_update_compile_flags(automemcpy_codegen)
 
 add_executable(automemcpy_codegen_main CodeGenMain.cpp RandomFunctionGenerator.cpp)
 target_link_libraries(automemcpy_codegen_main PUBLIC automemcpy_codegen ${Z3_LIBRARIES})
-target_compile_options(automemcpy_codegen_main PUBLIC -fno-rtti)
+llvm_update_compile_flags(automemcpy_codegen_main)
 
 set(Implementations "${CMAKE_CURRENT_BINARY_DIR}/Implementations.cpp")
 add_custom_command(
@@ -19,14 +19,18 @@ add_custom_command(
 add_library(automemcpy_implementations "${Implementations}")
 target_link_libraries(automemcpy_implementations PUBLIC LLVMSupport libc-memory-benchmark)
 target_include_directories(automemcpy_implementations PRIVATE ${LIBC_SOURCE_DIR} ${LIBC_AUTOMEMCPY_INCLUDE_DIR})
-target_compile_options(automemcpy_implementations PUBLIC -fno-rtti PRIVATE ${LIBC_COMPILE_OPTIONS_NATIVE} "SHELL:-mllvm -combiner-global-alias-analysis" -fno-builtin)
+target_compile_options(automemcpy_implementations PRIVATE ${LIBC_COMPILE_OPTIONS_NATIVE} "SHELL:-mllvm -combiner-global-alias-analysis" -fno-builtin)
+llvm_update_compile_flags(automemcpy_implementations)
 
 add_executable(automemcpy EXCLUDE_FROM_ALL ${LIBC_SOURCE_DIR}/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp)
 target_link_libraries(automemcpy PRIVATE libc-memory-benchmark benchmark_main automemcpy_implementations)
+llvm_update_compile_flags(automemcpy)
 
 add_library(automemcpy_result_analyzer_lib EXCLUDE_FROM_ALL ResultAnalyzer.cpp)
 target_link_libraries(automemcpy_result_analyzer_lib PUBLIC LLVMSupport)
 target_include_directories(automemcpy_result_analyzer_lib PUBLIC ${LIBC_AUTOMEMCPY_INCLUDE_DIR})
+llvm_update_compile_flags(automemcpy_result_analyzer_lib)
 
 add_executable(automemcpy_result_analyzer EXCLUDE_FROM_ALL ResultAnalyzerMain.cpp)
 target_link_libraries(automemcpy_result_analyzer PRIVATE automemcpy_result_analyzer_lib automemcpy_implementations)
+llvm_update_compile_flags(automemcpy_result_analyzer)