BSD Commit Log Search

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge branch 'freebsd/current/main' into hardened/current/master

* freebsd/current/main:
  sendfile: Clear page pointers when handling a pager error
  cam: Remove Giant handling from cam_sim_alloc()
  Ensure that dirent's d_off field is initialized
  uma: Avoid unmapping direct-mapped slabs
  Add old bsdgrep aliases to ObsoleteFiles.inc
  bhyve: fix build without casper/capsicum support
  fusefs: only check vnode locks with DEBUG_VFS_LOCKS
  Fix a vnode locking bug in fuse_vnop_advlock.
  cap_net: CAPNET_CONNECT and CAPNET_CONNECTDNS are not mutually exclusive
  cap_net: allow to use the service without setting the limits
  capser: add cap_net to the list of services
  zstd: Fix non-FreeBSD CI libzstd build
  Update contrib/llvm-project/FREEBSD-Xlist for llvmorg-11.0.1-rc2.
  Vendor import of llvm-project branch release/11.x llvmorg-11.0.1-rc2-0-g43ff75f2c3f (aka 11.0.1 rc2).

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
release/11.x llvmorg-11.0.1-rc2-0-g43ff75f2c3f (aka 11.0.1 rc2).

MFC after:      4 weeks
X-MFC-With:     r364284

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
        share/mk/sys.mk (unresolved)

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)

MFH

Sponsored by:   Rubicon Communications, LLC (netgate.com)

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        lib/clang/libllvm/Makefile (unresolved)

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
release/11.x llvmorg-11.0.0-rc1-47-gff47911ddfc.

MFC after:      6 weeks

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
release/11.x llvmorg-11.0.0-rc1-47-gff47911ddfc.

MFC after:      6 weeks

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from
which release/11.x was branched.

Note that for now, I rolled back all our local changes to make merging
easier, and I will reapply the still-relevant ones after updating to
11.0.0-rc1.

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from
which release/11.x was branched.

Note that for now, I rolled back all our local changes to make merging
easier, and I will reapply the still-relevant ones after updating to
11.0.0-rc1.

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
llvmorg-10.0.0-0-gd32170dbd5b (aka 10.0.0 release), and a number of
follow-ups.

MFC r356479 (by bdragon):

[PowerPC] Fix libllvmminimal build when building from powerpc64 ELFv1.

When bootstrapping on powerpc64 ELFv1, it is necessary to use binutils
ld.bfd from ports for the bootstrap, as this is the only modern linker for
ELFv1 host tools.

As binutils ld.bfd is rather strict in its handling of undefined symbols,
it is necessary to pull in Support/Atomic.cpp to avoid an undefined symbol.

Reviewed by:    dim, emaste
Sponsored by:   Tag1 Consulting, Inc.
Differential Revision:  https://reviews.freebsd.org/D23072


    [404 lines not shown]

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master

Conflicts:
        sys/arm/arm/machdep.c (unresolved)
        tools/build/mk/OptionalObsoleteFiles.inc (unresolved)

MFC r355940:

Move all sources from the llvm project into contrib/llvm-project.

This uses the new layout of the upstream repository, which was recently
migrated to GitHub, and converted into a "monorepo".  That is, most of
the earlier separate sub-projects with their own branches and tags were
consolidated into one top-level directory, and are now branched and
tagged together.

Updating the vendor area to match this layout is next.

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
10.0.0 release.

MFC r356479 (by bdragon):

[PowerPC] Fix libllvmminimal build when building from powerpc64 ELFv1.

When bootstrapping on powerpc64 ELFv1, it is necessary to use binutils
ld.bfd from ports for the bootstrap, as this is the only modern linker for
ELFv1 host tools.

As binutils ld.bfd is rather strict in its handling of undefined symbols,
it is necessary to pull in Support/Atomic.cpp to avoid an undefined symbol.

Reviewed by:    dim, emaste
Sponsored by:   Tag1 Consulting, Inc.
Differential Revision:  https://reviews.freebsd.org/D23072

MFC r356930:

    [450 lines not shown]

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
10.0.0 release.

MFC r356479 (by bdragon):

[PowerPC] Fix libllvmminimal build when building from powerpc64 ELFv1.

When bootstrapping on powerpc64 ELFv1, it is necessary to use binutils
ld.bfd from ports for the bootstrap, as this is the only modern linker for
ELFv1 host tools.

As binutils ld.bfd is rather strict in its handling of undefined symbols,
it is necessary to pull in Support/Atomic.cpp to avoid an undefined symbol.

Reviewed by:    dim, emaste
Sponsored by:   Tag1 Consulting, Inc.
Differential Revision:  https://reviews.freebsd.org/D23072

MFC r356930:

    [450 lines not shown]

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        lib/clang/llvm.build.mk (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)

Merge remote-tracking branch 'tor/freebsd/current/master' into hardened/current/master

Conflicts:
        lib/clang/llvm.build.mk (unresolved)

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
10.0.0-rc3 c290cb61fdc.

Release notes for llvm, clang, lld and libc++ 10.0.0 will become
available here:

https://releases.llvm.org/10.0.0/docs/ReleaseNotes.html
https://releases.llvm.org/10.0.0/tools/clang/docs/ReleaseNotes.html
https://releases.llvm.org/10.0.0/tools/lld/docs/ReleaseNotes.html
https://releases.llvm.org/10.0.0/projects/libcxx/docs/ReleaseNotes.html

PR:             244251
MFC after:      6 weeks

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
10.0.0-rc3 c290cb61fdc.

Release notes for llvm, clang, lld and libc++ 10.0.0 will become
available here:

https://releases.llvm.org/10.0.0/docs/ReleaseNotes.html
https://releases.llvm.org/10.0.0/tools/clang/docs/ReleaseNotes.html
https://releases.llvm.org/10.0.0/tools/lld/docs/ReleaseNotes.html
https://releases.llvm.org/10.0.0/projects/libcxx/docs/ReleaseNotes.html

PR:             244251
MFC after:      6 weeks

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        gnu/lib/libgcc/Makefile (deleted)
        share/man/man5/src.conf.5 (unresolved)
        usr.bin/clang/lld/Makefile (unresolved)
        usr.sbin/rpc.statd/Makefile (unresolved)

Merge ^/vendor/clang/dist up to its last change, and resolve conflicts.

Merge ^/vendor/clang/dist up to its last change, and resolve conflicts.

Merge remote-tracking branch 'origin/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        contrib/compiler-rt/lib/cfi/cfi.cc (deleted)
        contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.cpp (deleted)
        lib/libclang_rt/Makefile (unresolved)
        lib/libclang_rt/cfi/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        tools/build/mk/OptionalObsoleteFiles.inc (unresolved)
        usr.bin/clang/lld/Makefile (unresolved)

MFC r355940:

Move all sources from the llvm project into contrib/llvm-project.

This uses the new layout of the upstream repository, which was recently
migrated to GitHub, and converted into a "monorepo".  That is, most of
the earlier separate sub-projects with their own branches and tags were
consolidated into one top-level directory, and are now branched and
tagged together.

Updating the vendor area to match this layout is next.

MFC r355940:

Move all sources from the llvm project into contrib/llvm-project.

This uses the new layout of the upstream repository, which was recently
migrated to GitHub, and converted into a "monorepo".  That is, most of
the earlier separate sub-projects with their own branches and tags were
consolidated into one top-level directory, and are now branched and
tagged together.

Updating the vendor area to match this layout is next.

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        usr.bin/clang/lld/Makefile (unresolved)

Move all sources from the llvm project into contrib/llvm-project.

This uses the new layout of the upstream repository, which was recently
migrated to GitHub, and converted into a "monorepo".  That is, most of
the earlier separate sub-projects with their own branches and tags were
consolidated into one top-level directory, and are now branched and
tagged together.

Updating the vendor area to match this layout is next.

Move all sources from the llvm project into contrib/llvm-project.

This uses the new layout of the upstream repository, which was recently
migrated to GitHub, and converted into a "monorepo".  That is, most of
the earlier separate sub-projects with their own branches and tags were
consolidated into one top-level directory, and are now branched and
tagged together.

Updating the vendor area to match this layout is next.