svn commit: r318418 - in vendor/compiler-rt/dist/lib: asan/tests builtins ubsan

[Dimitry Andric]

Author: dim
Date: Wed May 17 20:22:58 2017
New Revision: 318418
URL: https://svnweb.freebsd.org/changeset/base/318418

Log:
  Vendor import of compiler-rt trunk r303291:
  https://llvm.org/svn/llvm-project/compiler-rt/trunk@303291

Modified:
  vendor/compiler-rt/dist/lib/asan/tests/asan_test_utils.h
  vendor/compiler-rt/dist/lib/builtins/floatdidf.c
  vendor/compiler-rt/dist/lib/ubsan/CMakeLists.txt

Modified: vendor/compiler-rt/dist/lib/asan/tests/asan_test_utils.h
==============================================================================
--- vendor/compiler-rt/dist/lib/asan/tests/asan_test_utils.h	Wed May 17 20:22:56 2017	(r318417)
+++ vendor/compiler-rt/dist/lib/asan/tests/asan_test_utils.h	Wed May 17 20:22:58 2017	(r318418)
@@ -30,11 +30,11 @@
 #include <stdint.h>
 #include <assert.h>
 #include <algorithm>
+#include <setjmp.h>
 
 #if !defined(_WIN32)
 # include <strings.h>
 # include <sys/mman.h>
-# include <setjmp.h>
 #endif
 
 #ifdef __linux__

Modified: vendor/compiler-rt/dist/lib/builtins/floatdidf.c
==============================================================================
--- vendor/compiler-rt/dist/lib/builtins/floatdidf.c	Wed May 17 20:22:56 2017	(r318417)
+++ vendor/compiler-rt/dist/lib/builtins/floatdidf.c	Wed May 17 20:22:58 2017	(r318418)
@@ -104,7 +104,7 @@ __floatdidf(di_int a)
 }
 #endif
 
-#if defined(__AEABI__)
+#if defined(__ARM_EABI__)
 AEABI_RTABI double __aeabi_l2d(di_int a) {
   return __floatdidf(a);
 }

Modified: vendor/compiler-rt/dist/lib/ubsan/CMakeLists.txt
==============================================================================
--- vendor/compiler-rt/dist/lib/ubsan/CMakeLists.txt	Wed May 17 20:22:56 2017	(r318417)
+++ vendor/compiler-rt/dist/lib/ubsan/CMakeLists.txt	Wed May 17 20:22:58 2017	(r318418)
@@ -34,6 +34,10 @@ set(UBSAN_CXXFLAGS ${SANITIZER_COMMON_CF
 append_rtti_flag(ON UBSAN_CXXFLAGS)
 append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS)
 
+append_list_if(COMPILER_RT_HAS_LIBDL dl UBSAN_DYNAMIC_LIBS)
+append_list_if(COMPILER_RT_HAS_LIBRT rt UBSAN_DYNAMIC_LIBS)
+append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread UBSAN_DYNAMIC_LIBS)
+
 add_compiler_rt_component(ubsan)
 
 if(APPLE)
@@ -144,6 +148,27 @@ else()
       CFLAGS ${UBSAN_CXXFLAGS}
       PARENT_TARGET ubsan)
 
+    add_compiler_rt_runtime(clang_rt.ubsan_standalone
+      SHARED
+      ARCHS ${UBSAN_SUPPORTED_ARCH}
+      OBJECT_LIBS RTSanitizerCommon
+              RTSanitizerCommonLibc
+              RTUbsan
+      CFLAGS ${UBSAN_CFLAGS}
+      LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
+      PARENT_TARGET ubsan)
+
+    add_compiler_rt_runtime(clang_rt.ubsan_standalone_cxx
+      SHARED
+      ARCHS ${UBSAN_SUPPORTED_ARCH}
+      OBJECT_LIBS RTSanitizerCommon
+              RTSanitizerCommonLibc
+              RTUbsan
+              RTUbsan_cxx
+      CFLAGS ${UBSAN_CXXFLAGS}
+      LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
+      PARENT_TARGET ubsan)
+
     if (UNIX)
       set(ARCHS_FOR_SYMBOLS ${UBSAN_SUPPORTED_ARCH})
       list(REMOVE_ITEM ARCHS_FOR_SYMBOLS i386 i686)