Re: git: 349cc55c9796 - main - Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b
Date: Sun, 15 May 2022 22:25:38 UTC
Dimitry Andric wrote: > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=349cc55c9796c4596a5b9904cd3281af295f878f > > commit 349cc55c9796c4596a5b9904cd3281af295f878f > Merge: cb2ae6163174 c0981da47d56 > Author: Dimitry Andric <dim@FreeBSD.org> > AuthorDate: 2022-03-20 11:40:34 +0000 > Commit: Dimitry Andric <dim@FreeBSD.org> > CommitDate: 2022-05-14 11:43:05 +0000 > > Merge llvm-project main llvmorg-14-init-10186-gff7f2cfa959b > > This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and > openmp to llvmorg-14-init-10186-gff7f2cfa959b. > > PR: 261742 > MFC after: 2 weeks > > .../llvm-project/compiler-rt/lib/builtins/atomic.c | 15 + > This errors out on -CURRENT immediately preceding this whole LLVM 14 merge: --- atomic.o --- /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:367:1: error: implicit declaration of function '__c11_atomic_fetch_nand' is invalid in C99 [-Werror, -Wimplicit-function-declaration] OPTIMISED_CASES ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:249:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(1, IS_LOCK_FREE_1, uint8_t) \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:366:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:342:14: note: expanded from macro 'ATOMIC_RMW_NAND' return __c11_atomic_fetch_nand((_Atomic(type) *)ptr, val, model); \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:367:1: note: did you mean '__c11_atomic_fetch_and'? /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:249:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(1, IS_LOCK_FREE_1, uint8_t) \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:366:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:342:14: note: expanded from macro 'ATOMIC_RMW_NAND' return __c11_atomic_fetch_nand((_Atomic(type) *)ptr, val, model); \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:358:1: note: '__c11_atomic_fetch_and' declared here OPTIMISED_CASES ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:249:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(1, IS_LOCK_FREE_1, uint8_t) \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:357:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW(n, lockfree, type, and, &) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:330:14: note: expanded from macro 'ATOMIC_RMW' return __c11_atomic_fetch_##opname((_Atomic(type) *)ptr, val, model); \ ^ <scratch space>:35:1: note: expanded from here __c11_atomic_fetch_and ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:367:1: error: implicit declaration of function '__c11_atomic_fetch_nand' is invalid in C99 [-Werror, -Wimplicit-function-declaration] OPTIMISED_CASES ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:250:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(2, IS_LOCK_FREE_2, uint16_t) \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:366:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:342:14: note: expanded from macro 'ATOMIC_RMW_NAND' return __c11_atomic_fetch_nand((_Atomic(type) *)ptr, val, model); \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:367:1: error: implicit declaration of function '__c11_atomic_fetch_nand' is invalid in C99 [-Werror, -Wimplicit-function-declaration] /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:251:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(4, IS_LOCK_FREE_4, uint32_t) \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:366:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:342:14: note: expanded from macro 'ATOMIC_RMW_NAND' return __c11_atomic_fetch_nand((_Atomic(type) *)ptr, val, model); \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:367:1: error: implicit declaration of function '__c11_atomic_fetch_nand' is invalid in C99 [-Werror, -Wimplicit-function-declaration] /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:252:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(8, IS_LOCK_FREE_8, uint64_t) \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:366:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:342:14: note: expanded from macro 'ATOMIC_RMW_NAND' return __c11_atomic_fetch_nand((_Atomic(type) *)ptr, val, model); \ ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:367:1: error: implicit declaration of function '__c11_atomic_fetch_nand' is invalid in C99 [-Werror, -Wimplicit-function-declaration] /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:253:3: note: expanded from macro 'OPTIMISED_CASES' OPTIMISED_CASE(16, IS_LOCK_FREE_16, __uint128_t) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:366:43: note: expanded from macro 'OPTIMISED_CASE' #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) ^ /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c:342:14: note: expanded from macro 'ATOMIC_RMW_NAND' return __c11_atomic_fetch_nand((_Atomic(type) *)ptr, val, model); \ ^ 5 errors generated. *** [atomic.o] Error code 1 make[4]: stopped in /usr/src/lib/libcompiler_rt -- Charlie Li …nope, still don't have an exit line.