hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-15 06:42:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Follow-up r364753 by only using arm's stdatomic.c implementation, as it

Browse Source 
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
This commit is contained in:
Dimitry Andric 2020-09-10 16:47:12 +00:00
parent b7b5bdba96
commit 18ed63b8f1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365588
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libcompiler_rt/Makefile.inc
View File

@ -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