BSD Commit Log Search

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

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        usr.sbin/hbsd-update/hbsd-update.conf (unresolved)

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

Conflicts:
        contrib/llvm-project/clang/lib/Driver/SanitizerArgs.cpp (unresolved)
        lib/clang/liblldb/Makefile (unresolved)
        share/mk/src.opts.mk (unresolved)
        usr.bin/clang/llvm-ar/Makefile (unresolved)
        usr.bin/clang/llvm-nm/Makefile (unresolved)
        usr.bin/clang/llvm-objdump/Makefile (unresolved)

Merge llvm-project main llvmorg-13-init-16847-g88e66fa60ae5

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-13-init-16847-g88e66fa60ae5, the last commit before
the upstream release/13.x branch was created.

PR:             258209
MFC after:      2 weeks

(cherry picked from commit fe6060f10f634930ff71b7c50291ddc610da2475)

Merge remote-tracking branch 'origin/freebsd/12-stable/main' into hardened/12-stable/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
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.

(cherry picked from commit 5ffd83dbcc34f10e07f6d3e968ae6365869615f4)

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

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

Merge llvm-project main llvmorg-13-init-16847-g88e66fa60ae5

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-13-init-16847-g88e66fa60ae5, the last commit before
the upstream release/13.x branch was created.

PR:             258209

(cherry picked from commit fe6060f10f634930ff71b7c50291ddc610da2475)

Merge branch 'hardened/current/master' into hardened/current/sensitive

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

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

Merge llvm-project main llvmorg-13-init-16847-g88e66fa60ae5

This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-13-init-16847-g88e66fa60ae5, the last commit before
the upstream release/13.x branch was created.

PR:             258209
MFC after:      2 weeks

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

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 remote-tracking branch 'origin/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        Makefile.inc1 (unresolved)
        share/mk/src.opts.mk (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/mk/OptionalObsoleteFiles.inc (unresolved)

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
10.0.1 final (aka llvmorg-10.0.1-0-gef32c611aa2).

MFC r359582 (by emaste):

lldb: use lua as the default script language

In the FreeBSD base system we do not have Python support in lldb, but
will have Lua support.  Make Lua the default.

This needs to be made into a configure-time option; that is being
discussed upstream and will appear in a future lldb import.  For now
carry this change as a tiny patch to our copy of lldb.

MFC r359599 (by emaste):

lldb: add rule to generate LLDBWrapLua.cpp

Building lldb's lua/python bindings requires swig, but we do not want to

    [182 lines not shown]

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
10.0.1 final (aka llvmorg-10.0.1-0-gef32c611aa2).

MFC r359582 (by emaste):

lldb: use lua as the default script language

In the FreeBSD base system we do not have Python support in lldb, but
will have Lua support.  Make Lua the default.

This needs to be made into a configure-time option; that is being
discussed upstream and will appear in a future lldb import.  For now
carry this change as a tiny patch to our copy of lldb.

MFC r359599 (by emaste):

lldb: add rule to generate LLDBWrapLua.cpp

Building lldb's lua/python bindings requires swig, but we do not want to

    [182 lines not shown]

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

Conflicts:
        Makefile.inc1 (unresolved)
        lib/csu/amd64/Makefile (unresolved)
        lib/csu/i386/Makefile (unresolved)
        share/man/man5/src.conf.5 (unresolved)

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

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
llvmorg-10.0.0-129-gd24d5c8e308. Getting closer to 10.0.1-rc2.

MFC after:      3 weeks

Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
llvmorg-10.0.0-129-gd24d5c8e308. Getting closer to 10.0.1-rc2.

MFC after:      3 weeks

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]