svn commit: r312960 - in vendor/compiler-rt/dist: lib/builtins/arm lib/xray test/xray

[Dimitry Andric]

Author: dim
Date: Sun Jan 29 20:58:54 2017
New Revision: 312960
URL: https://svnweb.freebsd.org/changeset/base/312960

Log:
  Vendor import of compiler-rt release_40 branch r293443:
  https://llvm.org/svn/llvm-project/compiler-rt/branches/release_40@293443

Modified:
  vendor/compiler-rt/dist/lib/builtins/arm/comparesf2.S
  vendor/compiler-rt/dist/lib/xray/xray_arm.cc
  vendor/compiler-rt/dist/test/xray/lit.cfg

Modified: vendor/compiler-rt/dist/lib/builtins/arm/comparesf2.S
==============================================================================
--- vendor/compiler-rt/dist/lib/builtins/arm/comparesf2.S	Sun Jan 29 20:58:52 2017	(r312959)
+++ vendor/compiler-rt/dist/lib/builtins/arm/comparesf2.S	Sun Jan 29 20:58:54 2017	(r312960)
@@ -283,7 +283,7 @@ DEFINE_COMPILERRT_FUNCTION(__unordsf2)
 END_COMPILERRT_FUNCTION(__unordsf2)
 
 #if defined(COMPILER_RT_ARMHF_TARGET)
-DEFINE_COMPILERRT_FUNCTION(__aeabi_fcmpum):
+DEFINE_COMPILERRT_FUNCTION(__aeabi_fcmpum)
 	vmov s0, r0
 	vmov s1, r1
 	b SYMBOL_NAME(__unordsf2)

Modified: vendor/compiler-rt/dist/lib/xray/xray_arm.cc
==============================================================================
--- vendor/compiler-rt/dist/lib/xray/xray_arm.cc	Sun Jan 29 20:58:52 2017	(r312959)
+++ vendor/compiler-rt/dist/lib/xray/xray_arm.cc	Sun Jan 29 20:58:54 2017	(r312960)
@@ -19,6 +19,8 @@
 #include <atomic>
 #include <cassert>
 
+extern "C" void __clear_cache(void* start, void* end);
+
 namespace __xray {
 
 uint64_t cycleFrequency() XRAY_NEVER_INSTRUMENT {
@@ -116,8 +118,8 @@ inline static bool patchSled(const bool 
   //   B #20
 
   uint32_t *FirstAddress = reinterpret_cast<uint32_t *>(Sled.Address);
+  uint32_t *CurAddress = FirstAddress + 1;
   if (Enable) {
-    uint32_t *CurAddress = FirstAddress + 1;
     CurAddress =
         Write32bitLoadR0(CurAddress, reinterpret_cast<uint32_t>(FuncId));
     CurAddress =
@@ -125,6 +127,7 @@ inline static bool patchSled(const bool 
     *CurAddress = uint32_t(PatchOpcodes::PO_BlxIp);
     CurAddress++;
     *CurAddress = uint32_t(PatchOpcodes::PO_PopR0Lr);
+    CurAddress++;
     std::atomic_store_explicit(
         reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress),
         uint32_t(PatchOpcodes::PO_PushR0Lr), std::memory_order_release);
@@ -133,6 +136,8 @@ inline static bool patchSled(const bool 
         reinterpret_cast<std::atomic<uint32_t> *>(FirstAddress),
         uint32_t(PatchOpcodes::PO_B20), std::memory_order_release);
   }
+  __clear_cache(reinterpret_cast<char*>(FirstAddress),
+      reinterpret_cast<char*>(CurAddress));
   return true;
 }
 

Modified: vendor/compiler-rt/dist/test/xray/lit.cfg
==============================================================================
--- vendor/compiler-rt/dist/test/xray/lit.cfg	Sun Jan 29 20:58:52 2017	(r312959)
+++ vendor/compiler-rt/dist/test/xray/lit.cfg	Sun Jan 29 20:58:54 2017	(r312960)
@@ -30,8 +30,14 @@ config.substitutions.append(
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
-if config.host_os not in ['Linux'] or config.host_arch.find('64') == -1:
+if config.host_os not in ['Linux']:
   config.unsupported = True
+elif '64' not in config.host_arch:
+  if 'arm' in config.host_arch:
+    if '-mthumb' in config.target_cflags:
+      config.unsupported = True
+  else:
+    config.unsupported = True
 
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
 # e.g. because the test sometimes passes, sometimes fails.