Date: Thu, 24 Aug 2017 16:35:23 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r322841 - in vendor/compiler-rt/dist/lib: builtins/arm esan profile Message-ID: <201708241635.v7OGZNP5074070@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Aug 24 16:35:23 2017 New Revision: 322841 URL: https://svnweb.freebsd.org/changeset/base/322841 Log: Vendor import of compiler-rt release_50 branch r311606: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_50@311606 Modified: vendor/compiler-rt/dist/lib/builtins/arm/aeabi_dcmp.S vendor/compiler-rt/dist/lib/builtins/arm/aeabi_fcmp.S vendor/compiler-rt/dist/lib/esan/esan_sideline_linux.cpp vendor/compiler-rt/dist/lib/profile/InstrProfilingNameVar.c Modified: vendor/compiler-rt/dist/lib/builtins/arm/aeabi_dcmp.S ============================================================================== --- vendor/compiler-rt/dist/lib/builtins/arm/aeabi_dcmp.S Thu Aug 24 16:35:20 2017 (r322840) +++ vendor/compiler-rt/dist/lib/builtins/arm/aeabi_dcmp.S Thu Aug 24 16:35:23 2017 (r322841) @@ -18,11 +18,20 @@ // } // } +#if defined(COMPILER_RT_ARMHF_TARGET) +# define CONVERT_DCMP_ARGS_TO_DF2_ARGS \ + vmov d0, r0, r1 SEPARATOR \ + vmov d1, r2, r3 +#else +# define CONVERT_DCMP_ARGS_TO_DF2_ARGS +#endif + #define DEFINE_AEABI_DCMP(cond) \ .syntax unified SEPARATOR \ .p2align 2 SEPARATOR \ DEFINE_COMPILERRT_FUNCTION(__aeabi_dcmp ## cond) \ push { r4, lr } SEPARATOR \ + CONVERT_DCMP_ARGS_TO_DF2_ARGS SEPARATOR \ bl SYMBOL_NAME(__ ## cond ## df2) SEPARATOR \ cmp r0, #0 SEPARATOR \ b ## cond 1f SEPARATOR \ Modified: vendor/compiler-rt/dist/lib/builtins/arm/aeabi_fcmp.S ============================================================================== --- vendor/compiler-rt/dist/lib/builtins/arm/aeabi_fcmp.S Thu Aug 24 16:35:20 2017 (r322840) +++ vendor/compiler-rt/dist/lib/builtins/arm/aeabi_fcmp.S Thu Aug 24 16:35:23 2017 (r322841) @@ -18,11 +18,20 @@ // } // } +#if defined(COMPILER_RT_ARMHF_TARGET) +# define CONVERT_FCMP_ARGS_TO_SF2_ARGS \ + vmov s0, r0 SEPARATOR \ + vmov s1, r1 +#else +# define CONVERT_FCMP_ARGS_TO_SF2_ARGS +#endif + #define DEFINE_AEABI_FCMP(cond) \ .syntax unified SEPARATOR \ .p2align 2 SEPARATOR \ DEFINE_COMPILERRT_FUNCTION(__aeabi_fcmp ## cond) \ push { r4, lr } SEPARATOR \ + CONVERT_FCMP_ARGS_TO_SF2_ARGS SEPARATOR \ bl SYMBOL_NAME(__ ## cond ## sf2) SEPARATOR \ cmp r0, #0 SEPARATOR \ b ## cond 1f SEPARATOR \ Modified: vendor/compiler-rt/dist/lib/esan/esan_sideline_linux.cpp ============================================================================== --- vendor/compiler-rt/dist/lib/esan/esan_sideline_linux.cpp Thu Aug 24 16:35:20 2017 (r322840) +++ vendor/compiler-rt/dist/lib/esan/esan_sideline_linux.cpp Thu Aug 24 16:35:23 2017 (r322841) @@ -70,7 +70,7 @@ int SidelineThread::runSideline(void *Arg) { // Set up a signal handler on an alternate stack for safety. InternalScopedBuffer<char> StackMap(SigAltStackSize); - struct sigaltstack SigAltStack; + stack_t SigAltStack; SigAltStack.ss_sp = StackMap.data(); SigAltStack.ss_size = SigAltStackSize; SigAltStack.ss_flags = 0; Modified: vendor/compiler-rt/dist/lib/profile/InstrProfilingNameVar.c ============================================================================== --- vendor/compiler-rt/dist/lib/profile/InstrProfilingNameVar.c Thu Aug 24 16:35:20 2017 (r322840) +++ vendor/compiler-rt/dist/lib/profile/InstrProfilingNameVar.c Thu Aug 24 16:35:23 2017 (r322841) @@ -1,11 +1,11 @@ -//===- InstrProfilingNameVar.c - profile name variable setup --------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// +/*===- InstrProfilingNameVar.c - profile name variable setup -------------===*\ +|* +|* The LLVM Compiler Infrastructure +|* +|* This file is distributed under the University of Illinois Open Source +|* License. See LICENSE.TXT for details. +|* +\*===----------------------------------------------------------------------===*/ #include "InstrProfiling.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708241635.v7OGZNP5074070>