[llvm] f715fa5 - Revert "Reland [compiler-rt][CMake] Properly set COMPILER_RT_HAS_LLD"
Arthur Eubanks via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 6 16:01:18 PDT 2023
Author: Arthur Eubanks
Date: 2023-06-06T16:01:05-07:00
New Revision: f715fa5cd88f73c55286fb5eeb991daecef57818
URL: https://github.com/llvm/llvm-project/commit/f715fa5cd88f73c55286fb5eeb991daecef57818
DIFF: https://github.com/llvm/llvm-project/commit/f715fa5cd88f73c55286fb5eeb991daecef57818.diff
LOG: Revert "Reland [compiler-rt][CMake] Properly set COMPILER_RT_HAS_LLD"
This reverts commit fffa05a2bcb548d5189e8c2e52d2ed2e7ebb2498.
This seems to cause hwasan tests to run in environments it didn't run in before.
Added:
Modified:
compiler-rt/CMakeLists.txt
compiler-rt/test/hwasan/TestCases/sizes.cpp
llvm/runtimes/CMakeLists.txt
Removed:
################################################################################
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 80954df33c216..6489aa17c2292 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -738,8 +738,14 @@ if(COMPILER_RT_USE_LIBCXX)
endif()
endif()
-if(COMPILER_RT_HAS_TRUNK_LLD AND LLVM_USE_LINKER STREQUAL "lld")
+set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/tools/lld)
+if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
set(COMPILER_RT_HAS_LLD TRUE)
+else()
+ set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/../lld)
+ if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
+ set(COMPILER_RT_HAS_LLD TRUE)
+ endif()
endif()
if(ANDROID)
diff --git a/compiler-rt/test/hwasan/TestCases/sizes.cpp b/compiler-rt/test/hwasan/TestCases/sizes.cpp
index e3cc5826a952c..2cb70f52147ac 100644
--- a/compiler-rt/test/hwasan/TestCases/sizes.cpp
+++ b/compiler-rt/test/hwasan/TestCases/sizes.cpp
@@ -19,8 +19,6 @@
// RUN: %env_hwasan_opts=allocator_may_return_null=1 %run %t new-nothrow max 2>&1
// RUN: %run %t usable 2>&1
-// REQUIRES: android
-
// Tests for various edge cases related to sizes, notably the maximum size the
// allocator can allocate. Tests that an integer overflow in the parameters of
// calloc is caught.
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 4f2c1a1fe32cf..75256c1326be9 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -226,10 +226,6 @@ function(runtime_default_target)
set_enable_per_target_runtime_dir()
- if ("lld" IN_LIST LLVM_ENABLE_PROJECTS)
- list(APPEND extra_args -DCOMPILER_RT_HAS_TRUNK_LLD=TRUE)
- endif()
-
llvm_ExternalProject_Add(runtimes
${CMAKE_CURRENT_SOURCE_DIR}/../../runtimes
DEPENDS ${ARG_DEPENDS}
@@ -246,7 +242,6 @@ function(runtime_default_target)
${COMMON_CMAKE_ARGS}
${RUNTIMES_CMAKE_ARGS}
${ARG_CMAKE_ARGS}
- ${extra_args}
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
LLVM_USE_LINKER
${ARG_PREFIXES}
@@ -339,10 +334,6 @@ function(runtime_register_target name)
set_enable_per_target_runtime_dir()
- if ("lld" IN_LIST LLVM_ENABLE_PROJECTS)
- list(APPEND ${name}_extra_args -DCOMPILER_RT_HAS_TRUNK_LLD=TRUE)
- endif()
-
llvm_ExternalProject_Add(runtimes-${name}
${CMAKE_CURRENT_SOURCE_DIR}/../../runtimes
DEPENDS ${ARG_DEPENDS}
More information about the llvm-commits
mailing list