[compiler-rt] r313583 - [ubsan] Split ubsan_init_standalone

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Sep 18 15:38:18 2017
New Revision: 313583

URL: http://llvm.org/viewvc/llvm-project?rev=313583&view=rev
Log:
[ubsan] Split ubsan_init_standalone

On Linux we may need preinit_array in static lib and
ubsan_standalone_initializer in shared lib.

Modified:
    compiler-rt/trunk/lib/ubsan/CMakeLists.txt
    compiler-rt/trunk/lib/ubsan/ubsan_init_standalone.cc

Modified: compiler-rt/trunk/lib/ubsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/CMakeLists.txt?rev=313583&r1=313582&r2=313583&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/ubsan/CMakeLists.txt Mon Sep 18 15:38:18 2017
@@ -10,7 +10,6 @@ set(UBSAN_SOURCES
 
 set(UBSAN_STANDALONE_SOURCES
   ubsan_diag_standalone.cc
-  ubsan_init_standalone.cc
   )
 
 set(UBSAN_CXXABI_SOURCES
@@ -64,6 +63,7 @@ if(APPLE)
       OS ${SANITIZER_COMMON_SUPPORTED_OS}
       ARCHS ${UBSAN_SUPPORTED_ARCH}
       SOURCES ${UBSAN_STANDALONE_SOURCES}
+              ubsan_init_standalone.cc
       CFLAGS ${UBSAN_STANDALONE_CFLAGS})
 
     add_weak_symbols("ubsan" WEAK_SYMBOL_LINK_FLAGS)
@@ -133,7 +133,15 @@ else()
     # Initializer of standalone UBSan runtime.
     add_compiler_rt_object_libraries(RTUbsan_standalone
       ARCHS ${UBSAN_SUPPORTED_ARCH}
-      SOURCES ${UBSAN_STANDALONE_SOURCES} CFLAGS ${UBSAN_STANDALONE_CFLAGS})
+      SOURCES ${UBSAN_STANDALONE_SOURCES}
+              ubsan_init_standalone
+      CFLAGS ${UBSAN_STANDALONE_CFLAGS})
+    # This can't not be linked into share lib
+    add_compiler_rt_object_libraries(RTUbsan_standalone_preinit
+      ARCHS ${UBSAN_SUPPORTED_ARCH}
+      SOURCES ${UBSAN_STANDALONE_SOURCES}
+              ubsan_init_standalone_preinit.cc
+      CFLAGS ${UBSAN_STANDALONE_CFLAGS})
 
     # Standalone UBSan runtimes.
     add_compiler_rt_runtime(clang_rt.ubsan_standalone
@@ -142,7 +150,7 @@ else()
       OBJECT_LIBS RTSanitizerCommon
               RTSanitizerCommonLibc
               RTUbsan
-              RTUbsan_standalone
+              RTUbsan_standalone_preinit
       CFLAGS ${UBSAN_CFLAGS}
       PARENT_TARGET ubsan)
 
@@ -160,6 +168,7 @@ else()
         OBJECT_LIBS RTSanitizerCommon
                 RTSanitizerCommonLibc
                 RTUbsan
+                RTUbsan_standalone
         CFLAGS ${UBSAN_CFLAGS}
         LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}
         LINK_LIBS ${UBSAN_DYNAMIC_LIBS}

Modified: compiler-rt/trunk/lib/ubsan/ubsan_init_standalone.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_init_standalone.cc?rev=313583&r1=313582&r2=313583&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/ubsan_init_standalone.cc (original)
+++ compiler-rt/trunk/lib/ubsan/ubsan_init_standalone.cc Mon Sep 18 15:38:18 2017
@@ -19,11 +19,6 @@
 #include "sanitizer_common/sanitizer_internal_defs.h"
 #include "ubsan_init.h"
 
-#if SANITIZER_CAN_USE_PREINIT_ARRAY
-__attribute__((section(".preinit_array"), used))
-void (*__local_ubsan_preinit)(void) = __ubsan::InitAsStandalone;
-#else
-// Use a dynamic initializer.
 class UbsanStandaloneInitializer {
  public:
   UbsanStandaloneInitializer() {
@@ -31,5 +26,3 @@ class UbsanStandaloneInitializer {
   }
 };
 static UbsanStandaloneInitializer ubsan_standalone_initializer;
-#endif  // SANITIZER_CAN_USE_PREINIT_ARRAY
-