The branch main has been updated by dim:
URL:
https://cgit.FreeBSD.org/src/commit/?id=133180557479cd9676758e6f3f93a9d3e1c6b532
commit 133180557479cd9676758e6f3f93a9d3e1c6b532
Author: Dimitry Andric <d...@freebsd.org>
AuthorDate: 2021-12-30 09:53:25 +0000
Commit: Dimitry Andric <d...@freebsd.org>
CommitDate: 2021-12-30 09:55:49 +0000
Avoid emitting popcnt in libclang_rt.fuzzer*.a if unsupported
Since popcnt is only supported by CPUTYPE=nehalem and later, ensure that
this instruction is only emitted when appropriate. Otherwise, programs
using the library can abort with SIGILL.
See also: https://github.com/llvm/llvm-project/issues/52893
PR: 258156
Reported by: Eric Rucker <bhtoo...@bhtooefr.org>
MFC after: 3 days
---
contrib/llvm-project/compiler-rt/lib/fuzzer/FuzzerPlatform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/llvm-project/compiler-rt/lib/fuzzer/FuzzerPlatform.h
b/contrib/llvm-project/compiler-rt/lib/fuzzer/FuzzerPlatform.h
index 1602e6789500..65e77ded8e82 100644
--- a/contrib/llvm-project/compiler-rt/lib/fuzzer/FuzzerPlatform.h
+++ b/contrib/llvm-project/compiler-rt/lib/fuzzer/FuzzerPlatform.h
@@ -87,7 +87,7 @@
(LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD ||
\
LIBFUZZER_FREEBSD || LIBFUZZER_EMSCRIPTEN)
-#ifdef __x86_64
+#if defined(__x86_64) && defined(__POPCNT__)
#if __has_attribute(target)
#define ATTRIBUTE_TARGET_POPCNT __attribute__((target("popcnt")))
#else
