diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-09-10 16:47:12 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-09-10 16:47:12 +0000 |
| commit | 18ed63b8f13c9d90d953c8803b0bb22632fe3c7a (patch) | |
| tree | 4a006b5bbbf4d03b708e8587dd58fc7c1ad982aa | |
| parent | b7b5bdba9610255d1108e72110f0dace21d5965a (diff) | |
| download | src-test2-18ed63b8f13c9d90d953c8803b0bb22632fe3c7a.tar.gz src-test2-18ed63b8f13c9d90d953c8803b0bb22632fe3c7a.zip | |
Follow-up r364753 by only using arm's stdatomic.c implementation, as it
already covers the functions in compiler-rt's atomic.c, leading to
conflicts when linking.
PR: 230888
MFC after: 3 days
X-MFC-With: r364753
Notes
Notes:
svn path=/head/; revision=365588
| -rw-r--r-- | lib/libcompiler_rt/Makefile.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc index 10797e93e63b..aa0a6a6c9e69 100644 --- a/lib/libcompiler_rt/Makefile.inc +++ b/lib/libcompiler_rt/Makefile.inc @@ -124,7 +124,8 @@ SRCF+= umodti3 # Enable compiler-rt's atomic implementation only for clang, as it uses clang # specific builtins, and gcc packages usually come with their own libatomic. -.if "${COMPILER_TYPE}" == "clang" +# Exclude arm which has its own implementations of atomic functions, below. +.if "${COMPILER_TYPE}" == "clang" && ${MACHINE_CPUARCH} != "arm" SRCF+= atomic .endif |