[compiler-rt] 2fe987e - [scudo] Build scudo_standalone on Android and Fuchsia.

[Mitch Phillips via llvm-commits]

Author: Mitch Phillips
Date: 2021-05-26T15:29:28-07:00
New Revision: 2fe987e6bacea8884a397041c13a38e8ba97c2d6

URL: https://github.com/llvm/llvm-project/commit/2fe987e6bacea8884a397041c13a38e8ba97c2d6
DIFF: https://github.com/llvm/llvm-project/commit/2fe987e6bacea8884a397041c13a38e8ba97c2d6.diff

LOG: [scudo] Build scudo_standalone on Android and Fuchsia.

This should be fine now, and is necessary for D102543.

Reviewed By: cryptoad

Differential Revision: https://reviews.llvm.org/D103200

Added: 
    

Modified: 
    compiler-rt/cmake/config-ix.cmake

Removed: 
    


################################################################################
diff  --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index 39e0a4b662c7b..dced7d383bcc6 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -765,9 +765,9 @@ else()
   set(COMPILER_RT_HAS_CFI FALSE)
 endif()
 
-#TODO(kostyak): add back Android & Fuchsia when the code settles a bit.
-if (SCUDO_STANDALONE_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux" AND
-    COMPILER_RT_HAS_AUXV)
+if (SCUDO_STANDALONE_SUPPORTED_ARCH AND (
+      (OS_NAME MATCHES "Fuchsia") OR
+      (OS_NAME MATCHES "Linux|Android" AND COMPILER_RT_HAS_AUXV)))
   set(COMPILER_RT_HAS_SCUDO_STANDALONE TRUE)
 else()
   set(COMPILER_RT_HAS_SCUDO_STANDALONE FALSE)