[PATCH] D35336: [compiler-rt][ARM] Fix filtering of ARM targets

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL310588: [compiler-rt][ARM] Fix filtering of ARM targets (authored by oleg).

Changed prior to commit:
  https://reviews.llvm.org/D35336?vs=106339&id=110568#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D35336

Files:
  compiler-rt/trunk/lib/builtins/CMakeLists.txt


Index: compiler-rt/trunk/lib/builtins/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/builtins/CMakeLists.txt
+++ compiler-rt/trunk/lib/builtins/CMakeLists.txt
@@ -492,9 +492,13 @@
     if (CAN_TARGET_${arch})
       # NOTE: some architectures (e.g. i386) have multiple names.  Ensure that
       # we catch them all.
-      set(_arch ${arch})
-      if("${arch}" STREQUAL "i686")
+      set(_arch ${arch})
+      if("${arch}" STREQUAL "i686")
         set(_arch "i386|i686")
+      elseif("${arch}" STREQUAL "armv6m")
+        set(_arch "arm|armv6m")
+      elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
+        set(_arch "arm")
       endif()
 
       # Filter out generic versions of routines that are re-implemented in


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35336.110568.patch
Type: text/x-patch
Size: 814 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170810/4a36afd5/attachment.bin>