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

[Oleg Ranevskyy via Phabricator via llvm-commits]

iid_iunknown created this revision.
Herald added subscribers: kristof.beyls, mgorny, dberris, aemerson.

Similarly to i686, the ARM build target has multiple names, such as armhf, armv7 and so on. Currently we get duplicated symbol definitions for these targets while compiling the library. Each duplicated definition has its generic version from `lib/builtins` and an ARM-specialized version from `lib/builtins/arm`.

This patch fixes filtering for ARM to ignore the generic definitions if they have their ARM specializations.


Repository:
  rL LLVM

https://reviews.llvm.org/D35336

Files:
  lib/builtins/CMakeLists.txt


Index: lib/builtins/CMakeLists.txt
===================================================================
--- lib/builtins/CMakeLists.txt
+++ lib/builtins/CMakeLists.txt
@@ -495,6 +495,10 @@
       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.106339.patch
Type: text/x-patch
Size: 568 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170712/6575d12c/attachment.bin>