src/targets, branch stable/13 FreeBSD source tree Merge llvm-project main llvmorg-17-init-19304-gd0b54bb50e51 2024-01-07T23:04:38+00:00 Dimitry Andric dim@FreeBSD.org 2023-09-02T21:17:18+00:00 0e1e0ce556810ad5f9d45485e686f0653530516c This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-17-init-19304-gd0b54bb50e51, the last commit before the upstream release/17.x branch was created. PR: 273753 MFC after: 1 month (cherry picked from commit 06c3fb2749bda94cb5201f81ffdb8fa6c3161b2e) 
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvm-project main llvmorg-17-init-19304-gd0b54bb50e51, the
last commit before the upstream release/17.x branch was created.

PR:		273753
MFC after:	1 month

(cherry picked from commit 06c3fb2749bda94cb5201f81ffdb8fa6c3161b2e)
targets: Catch up with the removal of sparc64 2024-01-05T21:52:03+00:00 Marius Strobl marius@FreeBSD.org 2023-08-06T19:51:01+00:00 c1c5c54b62193654ba65ec0acf1799238a9c4c3f (cherry picked from commit ba3c1f5972d7b90feb6e6da47905ff2757e0fe57) 
(cherry picked from commit ba3c1f5972d7b90feb6e6da47905ff2757e0fe57)
Remove $FreeBSD$: one-line sh pattern 2023-08-23T17:43:30+00:00 Warner Losh imp@FreeBSD.org 2023-08-22T01:32:01+00:00 023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9 Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit d0b2dbfa0ecf) 
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
Fix bootstrapping to actually build lldb-tblgen for later use 2021-09-07T12:08:18+00:00 Jessica Clarke jrtc27@FreeBSD.org 2021-08-24T13:59:04+00:00 e515dd81ff4f5d8b8b642078ceff54086b5cb7c0 Because MK_LLDB=no is in BSARGS, the bootstrap-tools recursive make does not add lldb-tblgen to _clang_tblgen, causing it to not be built. This means that the build currently always uses the host's lldb-tblgen (which, whilst currently it appears to work, could in future break if TableGen backends are added or altered) and, if it doesn't exist (either because the current FreeBSD system was built with it disabled, or you're building on macOS/Linux), fails. Linux and macOS cross-builds used to work simply because LLDB was previously in BROKEN_OPTIONS when building on non-FreeBSD. Instead, move MK_LLDB=no from BSARGS to XMAKE. This ensures that the lib/clang build in cross-tools continues to not build LLDB parts for the bootstrap toolchain (both to save time/space on FreeBSD, and because our vendored LLDB does not include the macOS and Linux host files so those would fail to build). The DIRDEPS target is updated to move MK_LLDB=no from the BSARGS block that mirrors Makefile.inc1 to the line that disables additional toolchain components. The DIRDEPS build likely suffers from the same issue currently, but having never used it and not being familiar with how it works I am leaving that as-is. If it does suffer from the same issue it should be easily reproducible by renaming /usr/bin/lldb-tblgen or moving it to a directory not in PATH. Fixes: 31ba4ce8898f ("Allow bootstrapping llvm-tblgen on macOS and Linux") MFC after: 1 week Reviewed by: dim, emaste, imp Differential Revision: https://reviews.freebsd.org/D31531 (cherry picked from commit 1e4c802913af619ac15741bbd276e1141ca17dc9) 
Because MK_LLDB=no is in BSARGS, the bootstrap-tools recursive make does
not add lldb-tblgen to _clang_tblgen, causing it to not be built. This
means that the build currently always uses the host's lldb-tblgen
(which, whilst currently it appears to work, could in future break if
TableGen backends are added or altered) and, if it doesn't exist (either
because the current FreeBSD system was built with it disabled, or you're
building on macOS/Linux), fails. Linux and macOS cross-builds used to
work simply because LLDB was previously in BROKEN_OPTIONS when building
on non-FreeBSD.

Instead, move MK_LLDB=no from BSARGS to XMAKE. This ensures that the
lib/clang build in cross-tools continues to not build LLDB parts for the
bootstrap toolchain (both to save time/space on FreeBSD, and because our
vendored LLDB does not include the macOS and Linux host files so those
would fail to build).

The DIRDEPS target is updated to move MK_LLDB=no from the BSARGS block
that mirrors Makefile.inc1 to the line that disables additional
toolchain components. The DIRDEPS build likely suffers from the same
issue currently, but having never used it and not being familiar with
how it works I am leaving that as-is. If it does suffer from the same
issue it should be easily reproducible by renaming /usr/bin/lldb-tblgen
or moving it to a directory not in PATH.

Fixes:		31ba4ce8898f ("Allow bootstrapping llvm-tblgen on macOS and Linux")
MFC after:	1 week
Reviewed by:	dim, emaste, imp
Differential Revision:	https://reviews.freebsd.org/D31531

(cherry picked from commit 1e4c802913af619ac15741bbd276e1141ca17dc9)
Prefer MK_SSP=no to SSP_CFLAGS= 2021-08-11T16:56:28+00:00 Mitchell Horne mhorne@FreeBSD.org 2021-08-04T18:20:50+00:00 952226eedb0be32b2c952fb2ae12f76a62131c00 It is more idiomatic. CFLAGS is only augmented with $SSP_CFLAGS when $MK_SSP != "no". Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31401 (cherry picked from commit 61ed578ee66648eff206ee5622b66727bfb52e78) 
It is more idiomatic. CFLAGS is only augmented with $SSP_CFLAGS when
$MK_SSP != "no".

Reviewed by:	imp
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D31401

(cherry picked from commit 61ed578ee66648eff206ee5622b66727bfb52e78)
mk: format some option lists 2021-08-11T16:53:16+00:00 Mitchell Horne mhorne@FreeBSD.org 2021-08-04T18:17:34+00:00 19cbaf34a3e47475f72f2ba3783d9281ca57996f Alphabetize and give each option its own line, ahead of making another change to these lists. This makes future diffs easier to read. Reviewed by: imp, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31399 (cherry picked from commit bcd2f41f7d222a942fe0a268614b46d3ec3af4c0) 
Alphabetize and give each option its own line, ahead of making another
change to these lists. This makes future diffs easier to read.

Reviewed by:	imp, emaste
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D31399

(cherry picked from commit bcd2f41f7d222a942fe0a268614b46d3ec3af4c0)
Remove mkcsmapper_static and mkesdb_static from build-tools 2021-08-05T09:00:56+00:00 Alex Richardson arichardson@FreeBSD.org 2021-08-02T09:49:01+00:00 1d7c196d119dcb5571ec4dff91d95327d1b5c91b Build them as part of the bootstrap-tools phase instead. Reviewed by: emaste (no objections) Differential Revision: https://reviews.freebsd.org/D28181 (cherry picked from commit 2de949cf85d0e0b9ff71e1ffd74153814de96175) 
Build them as part of the bootstrap-tools phase instead.

Reviewed by:	emaste (no objections)
Differential Revision: https://reviews.freebsd.org/D28181

(cherry picked from commit 2de949cf85d0e0b9ff71e1ffd74153814de96175)
targets: no longer depend on bt3cfw(8) 2021-01-16T22:53:13+00:00 Marius Strobl marius@FreeBSD.org 2021-01-09T11:10:07+00:00 ee7231c92936b17c592ad9d4dd92a560ff320191 The latter has been removed in 23e124c78bcb46ac78d9f06449c4454f43732805. 
The latter has been removed in 23e124c78bcb46ac78d9f06449c4454f43732805.
Rename NO_WERROR -> MK_WERROR=no 2021-01-07T09:31:03+00:00 Alex Richardson Alexander.Richardson@cl.cam.ac.uk 2021-01-06T17:55:06+00:00 7fa2f2a62f04f095e1e27ad55aa22a8f59b1df8f As suggested in D27598. This also supports MK_WERROR.clang=no and MK_WERROR.gcc=no to support the existing NO_WERROR.<compiler> uses. Reviewed By: brooks Differential Revision: https://reviews.freebsd.org/D27601 
As suggested in D27598. This also supports MK_WERROR.clang=no and
MK_WERROR.gcc=no to support the existing NO_WERROR.<compiler> uses.

Reviewed By:	brooks
Differential Revision: https://reviews.freebsd.org/D27601
Stop passing MK_WARNS=no for bootstrap tools 2021-01-07T09:31:03+00:00 Alex Richardson Alexander.Richardson@cl.cam.ac.uk 2021-01-06T17:52:02+00:00 94ffff68c8e84d4983e3d803575cfdb3e5782515 I got annoyed by the number of warnings that the CheriBSD build was emitting. It turns out that we are emitting lots of warnings during bootstrap because bootstrap tools are built with the default compiler flags and ignore the warnings flags that are set in bsd.sys.mk. Looking at git blame, it appears that MK_WARNS=no has been passed since rS112869, replacing the -DNO_WERROR option that was added in rS87775. This commit changes MK_WARNS=no back to -DNO_WERROR. We need to pass -DNO_WERROR, since the system compiler might have new warnings that we don't know about yet, and we shouldn't fail the build in that case. Reviewed By: imp, brooks Differential Revision: https://reviews.freebsd.org/D27598 
I got annoyed by the number of warnings that the CheriBSD build was
emitting. It turns out that we are emitting lots of warnings during
bootstrap because bootstrap tools are built with the default compiler
flags and ignore the warnings flags that are set in bsd.sys.mk.

Looking at git blame, it appears that MK_WARNS=no has been passed since
rS112869, replacing the -DNO_WERROR option that was added in rS87775.

This commit changes MK_WARNS=no back to -DNO_WERROR. We need to pass
-DNO_WERROR, since the system compiler might have new warnings that we
don't know about yet, and we shouldn't fail the build in that case.

Reviewed By:	imp, brooks
Differential Revision: https://reviews.freebsd.org/D27598