From owner-svn-src-vendor@freebsd.org Wed May 17 20:23:00 2017 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4CB20D7154C; Wed, 17 May 2017 20:23:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F5BC1CF7; Wed, 17 May 2017 20:22:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4HKMx76015469; Wed, 17 May 2017 20:22:59 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4HKMwLg015466; Wed, 17 May 2017 20:22:58 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201705172022.v4HKMwLg015466@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 17 May 2017 20:22:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r318418 - in vendor/compiler-rt/dist/lib: asan/tests builtins ubsan X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2017 20:23:00 -0000 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 #include #include +#include #if !defined(_WIN32) # include # include -# include #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)