Author: dim
Date: Thu Sep 10 16:47:12 2020
New Revision: 365588
URL: https://svnweb.freebsd.org/changeset/base/365588
Log:
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
Modified:
head/lib/libcompiler_rt/Makefile.inc
Modified: head/lib/libcompiler_rt/Makefile.inc
==============================================================================
--- head/lib/libcompiler_rt/Makefile.inc Thu Sep 10 16:47:08 2020
(r365587)
+++ head/lib/libcompiler_rt/Makefile.inc Thu Sep 10 16:47:12 2020
(r365588)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
