Skip to content

Commit 03e6857

Browse files
committed
[compiler-rt] [test] Look for the right file name suffix for arm targets
Compiler-rt libraries on arm use "arm" or "armhf" as suffix, not the full exact arch name like "armv7". This matches what was done for the build system in 8e11bed, to match the names that Clang expects (in getArchNameForCompilerRTLib in Clang). This fixes building a large number of the compiler-rt tests for Windows/armv7.
1 parent f218cd2 commit 03e6857

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

compiler-rt/test/lit.common.configured.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,13 @@ elif config.android:
6969
else:
7070
set_default("target_suffix", "-%s-android" % config.target_arch)
7171
else:
72-
set_default("target_suffix", "-%s" % config.target_arch)
72+
if config.target_arch.startswith("arm"):
73+
if config.target_arch.endswith("hf"):
74+
set_default("target_suffix", "-armhf")
75+
else:
76+
set_default("target_suffix", "-arm")
77+
else:
78+
set_default("target_suffix", "-%s" % config.target_arch)
7379

7480
set_default("have_internal_symbolizer", @COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL@)
7581
set_default("have_disable_symbolizer_path_search", @SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL@)

0 commit comments

Comments
 (0)