[compiler-rt] Add missing arguments to dynamic cflags

[bnbarham]

Summary

91bfccf83733e6d12a6da9f2e1a2d20a88fb974c added a shared library for
clang_rt.tsan and uses TSAN_RTL_DYNAMIC_CFLAGS for its CFLAGS. But
TSAN_RTL_DYNAMIC_CFLAGS was adding TSAN_RTL_CFLAGS before it had
actually been set with further arguments (eg. in the
COMPILER_RT_INTERCEPT_LIBDISPATCH block). Set it right before its use
to avoid this problem in the future.

[yln]

@ZijunZhao: what do you think?

[ZijunZhao]

compiler-rt/lib/tsan/rtl/CMakeLists.txt

72

I don't think we should set TSAN_RTL_DYNAMIC_CFLAGS in line 251, because we set(TSAN_RTL_DYNAMIC_CFLAGS ${TSAN_RTL_CFLAGS}) before. If we put these two statements later, the items in TSAN_RTL_DYNAMIC_CFLAGS will be different.

[bnbarham]

compiler-rt/lib/tsan/rtl/CMakeLists.txt

72

Sorry, I'm not quite understanding what you're saying here. TSAN_RTL_DYNAMIC_CFLAGS isn't set anywhere else in this file. The current issue is that it *doesn't* include eg. COMPILER_RT_LIBDISPATCH_CFLAGS because it was being set to TSAN_RTL_CFLAGS before TSAN_RTL_CFLAGS was actually finished having flags added to. Are you saying that was intentional?

[ZijunZhao]

compiler-rt/lib/tsan/rtl/CMakeLists.txt

72

yes, that's my concern. I was thinking about whether COMPILER_RT_LIBDISPATCH_CFLAGS should be included. Sorry for the misunderstanding. LGTM :D

compiler-rt/lib/tsan/rtl/CMakeLists.txt

 include_directories(../..)
 
 set(TSAN_RTL_CFLAGS ${TSAN_CFLAGS})
 append_list_if(COMPILER_RT_HAS_MSSE4_2_FLAG -msse4.2 TSAN_RTL_CFLAGS)
 append_list_if(SANITIZER_LIMIT_FRAME_SIZE -Wframe-larger-than=530
                TSAN_RTL_CFLAGS)
 append_list_if(COMPILER_RT_HAS_WGLOBAL_CONSTRUCTORS_FLAG -Wglobal-constructors
                TSAN_RTL_CFLAGS)
 
-set(TSAN_RTL_DYNAMIC_CFLAGS ${TSAN_RTL_CFLAGS})
-list(REMOVE_ITEM TSAN_RTL_DYNAMIC_CFLAGS -fPIE)
-
 set(TSAN_DYNAMIC_LINK_LIBS ${SANITIZER_CXX_ABI_LIBRARIES} ${SANITIZER_COMMON_LINK_LIBS})
 
 append_list_if(COMPILER_RT_HAS_LIBDL dl TSAN_DYNAMIC_LINK_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBM m TSAN_DYNAMIC_LINK_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread TSAN_DYNAMIC_LINK_LIBS)
 
 set(TSAN_SOURCES
   tsan_debugging.cpp
list(APPEND TSAN_SOURCES
     tsan_platform_posix.cpp
     )
 endif()
 
 if(COMPILER_RT_INTERCEPT_LIBDISPATCH)
   list(APPEND TSAN_SOURCES
     tsan_interceptors_libdispatch.cpp
     )
   list(APPEND TSAN_RTL_CFLAGS ${COMPILER_RT_LIBDISPATCH_CFLAGS})
 endif()
 
 set(TSAN_HEADERS
   tsan_defs.h
   tsan_dense_alloc.h
   tsan_fd.h
   tsan_flags.h
   tsan_flags.inc
add_compiler_rt_runtime(clang_rt.tsan_cxx
       ARCHS ${arch}
       SOURCES ${TSAN_CXX_SOURCES}
               $<TARGET_OBJECTS:RTUbsan_cxx.${arch}>
       ADDITIONAL_HEADERS ${TSAN_HEADERS}
       CFLAGS ${TSAN_RTL_CFLAGS}
       PARENT_TARGET tsan)
     list(APPEND TSAN_RUNTIME_LIBRARIES clang_rt.tsan-${arch}
                                        clang_rt.tsan_cxx-${arch})
+
+    set(TSAN_RTL_DYNAMIC_CFLAGS ${TSAN_RTL_CFLAGS})
+    list(REMOVE_ITEM TSAN_RTL_DYNAMIC_CFLAGS -fPIE)
     add_compiler_rt_runtime(clang_rt.tsan
       SHARED
       ARCHS ${arch}
       SOURCES ${TSAN_SOURCES} ${TSAN_ASM_SOURCES}
               $<TARGET_OBJECTS:RTInterception.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>