HardenedBSD/hardenedbsd a906febsys/vm vm_unix.c

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-5sys/vm/vm_unix.c
+0-51 files

HardenedBSD/hardenedbsd 887d9e4lib/libcasper/services/cap_sysctl cap_sysctl.c cap_sysctl.3, lib/libcasper/services/cap_sysctl/tests sysctl_test.c

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

Conflicts:
        sys/vm/vm_unix.c (unresolved)

HardenedBSD/hardenedbsd 6357299sys/amd64/linux32 Makefile, sys/compat/freebsd32 capabilities.conf

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

Conflicts:
        sys/i386/ibcs2/ibcs2_proto.h (deleted)
        sys/i386/ibcs2/ibcs2_syscall.h (deleted)
        sys/i386/ibcs2/ibcs2_sysent.c (deleted)

LLVM/llvm 372209llvm/trunk CMakeLists.txt, llvm/trunk/cmake/modules HandleLLVMOptions.cmake

[cmake] Changes to get Windows self-host working with PGO

Fixes quoting of profile arguments to work on Windows
Suppresses adding profile arguments to linker flags when using lld-link
Avoids -fprofile-instr-use being added to rc.exe flags
Removes duplicated adding of -fprofile-instr-use to linker flags (since
r355541)
Move handling LLVM_PROFDATA_FILE to HandleLLVMOptions.cmake

Differential Revision: https://reviews.llvm.org/D62063

FreeBSD/ports 512268head/dns/walker Makefile pkg-descr

- Add LICENSE
- Update WWW

Approved by:    portmgr blanket

FreeBSD/ports 512267branches 2019Q3, branches/2019Q3/cad/geda Makefile

MFH: r512266

Mark BROKEN with lld

Reported by:    pkg-fallout

FreeBSD/ports 512266head/cad/geda Makefile

Mark BROKEN with lld

Reported by:    pkg-fallout
MFH:           2019Q3

LLVM/llvm 372208llvm/trunk/lib/Target/AMDGPU VOP2Instructions.td, llvm/trunk/test/CodeGen/AMDGPU twoaddr-fma.mir twoaddr-mad.mir

[AMDGPU] Allow FP inline constant in v_madak_f16 and v_fmaak_f16

Differential Revision: https://reviews.llvm.org/D67680

Change-Id: Ic38f47cb2079c2c1070a441b5943854844d80a7c

FreeBSD/ports 512265head/japanese/newosaka Makefile

Mark BROKEN on FreeBSD 13

FreeBSD/ports 512264head/security/barnyard2 Makefile

security/barnyard2: Spell ODBC_CONFIGURE_WITH correctly

The option now actually activates the ODBC code paths but the port
fails to build with it.  The code seems to lack full support for
it in a couple of places, so mark the ODBC option as broken for
now.

spo_database.c:3547:3: error: use of undeclared identifier 'result'
result = 0;
^
spo_database.c:3841:41: warning: incompatible pointer types passing 'SQLINTEGER *' (aka 
'int *') to parameter of type 'SQLLEN *' (aka 'long *') [-Wincompatible-pointer-types]
if(SQLRowCount(data->u_statement, &data->u_rows) == SQL_SUCCESS)
^~~~~~~~~~~~~
/usr/local/include/sql.h:768:44: note: passing argument to parameter 'RowCount' here
SQLLEN *RowCount);
^
spo_database.c:3849:33: error: use of undeclared identifier 'result'
result = 0;
^
1 warning and 2 errors generated.

PR:            240237
Approved by:    bofh (maintainer timeout, 17 days)

FreeBSD/ports 512263branches 2019Q3, branches/2019Q3/cad/qcad Makefile

MFH: r512262

Mark BROKEN on i386 with lld

Reported by:    pkg-fallout

FreeBSD/ports 512262head/cad/qcad Makefile

Mark BROKEN on i386 with lld

Reported by:    pkg-fallout
MFH:           2019Q3

LLVM/llvm 372207llvm/trunk/include/llvm/Support Alignment.h, llvm/trunk/unittests/Support AlignmentTest.cpp

[Alignment] Add a None() member function

Summary:
This will allow writing `if(A != llvm::Align::None())` which is clearer than `if(A > 
llvm::Align(1))`

This is patch is part of a series to introduce an Alignment type.
See this thread for context: 
http://lists.llvm.org/pipermail/llvm-dev/2019-July/133851.html
See this patch for the introduction of the type: https://reviews.llvm.org/D64790

Reviewers: courbet

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D67697

LLVM/llvm 372206clang-tools-extra/trunk/clang-tidy/utils LexerUtils.h, clang-tools-extra/trunk/test/clang-tidy readability-isolate-declaration-no-infinite-loop.cpp

[clang-tidy] Fix a potential infinite loop in readability-isolate-declaration check.

Reviewers: ilya-biryukov

Subscribers: xazax.hun, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D67654

FreeBSD/ports 512261head/net-mgmt/icingaweb2-module-grafana distinfo pkg-plist

net-mgmt/icingaweb2-module-grafana: Update to 1.3.6

MFH:           2019Q3

LLVM/llvm 372205compiler-rt/trunk/lib/tsan/go tsan_go.cpp

tsan: allow the Go runtime to return multiple stack frames for a single PC

This fix allows tsan to report stack traces correctly even in the
presence of mid-stack inlining by the Go compiler.

See https://go-review.googlesource.com/c/go/+/195781 for the Go runtime side of this 
change.

Author: randall77 (Keith Randall)
Reviewed: https://reviews.llvm.org/D67671

FreeBSD/ports 512260head/mail/sid-milter Makefile

mail/sid-milter: Correctly spell pre-configure-NH_MFROM-on

Broken in r398460 during conversion to options helpers.

FreeBSD/ports 512259head/www/nginx distinfo Makefile, head/www/nginx/files extra-patch-passenger-disable-telemetry extra-patch-passenger-build-nginx.rb

Update 3rd party modul

Sponsored by:   Netzkommune GmbH

LLVM/llvm 372204llvm/trunk/include/llvm/CodeGen TargetFrameLowering.h, llvm/trunk/lib/CodeGen TargetFrameLoweringImpl.cpp RegUsageInfoCollector.cpp

[AArch64][DebugInfo] Do not recompute CalleeSavedStackSize

This patch fixes a bug exposed by D65653 where a subsequent invocation
of `determineCalleeSaves` ends up with a different size for the callee
save area, leading to different frame-offsets in debug information.

In the invocation by PEI, `determineCalleeSaves` tries to determine
whether it needs to spill an extra callee-saved register to get an
emergency spill slot. To do this, it calls 'estimateStackSize' and
manually adds the size of the callee-saves to this. PEI then allocates
the spill objects for the callee saves and the remaining frame layout
is calculated accordingly.

A second invocation in LiveDebugValues causes estimateStackSize to return
the size of the stack frame including the callee-saves. Given that the
size of the callee-saves is added to this, these callee-saves are counted
twice, which leads `determineCalleeSaves` to believe the stack has
become big enough to require spilling an extra callee-save as emergency
spillslot. It then updates CalleeSavedStackSize with a larger value.

Since CalleeSavedStackSize is used in the calculation of the frame
offset in getFrameIndexReference, this leads to incorrect offsets for
variables/locals when this information is recalculated after PEI.

Reviewers: omjavaid, eli.friedman, thegameg, efriedma

    [4 lines not shown]

LLVM/llvm 372203lldb/trunk/packages/Python/lldbsuite/test/commands/expression/diagnostics TestExprDiagnostics.py, lldb/trunk/source/Plugins/ExpressionParser/Clang ClangExpressionParser.cpp ClangExpressionSourceCode.cpp

[lldb] Print better diagnostics for user expressions and modules

Summary:
Currently our expression evaluators only prints very basic errors that are not very useful 
when writing complex expressions.

For example, in the expression below the user made a type error, but it's not clear from 
the diagnostic what went wrong:
```
(lldb) expr printf("Modulos are:", foobar%mo1, foobar%mo2, foobar%mo3)
error: invalid operands to binary expression ('int' and 'double')
```

This patch enables full Clang diagnostics in our expression evaluator. After this patch 
the diagnostics for the expression look like this:

```
(lldb) expr printf("Modulos are:", foobar%mo1, foobar%mo2, foobar%mo3)
error: <user expression 1>:1:54: invalid operands to binary expression ('int' and 'float')
printf("Modulos are:", foobar%mo1, foobar%mo2, foobar%mo3)
                                               ~~~~~~^~~~
```

To make this possible, we now emulate a user expression file within our diagnostics. This 
prevents that the user is exposed to

    [22 lines not shown]

LLVM/llvm 372202llvm/trunk/include/llvm/Support FileUtilities.h, llvm/trunk/lib/Support FileUtilities.cpp

Revert "r372201: [Support] Replace function with function_ref in writeFileAtomically. NFC"

function_ref causes calls to the function to be ambiguous, breaking
compilation.

Reverting for now.

NetBSD/pkgsrc KdnXWMwdoc CHANGES-2019

   Updated misc/py-anita to 2.0
VersionDeltaFile
1.3956+2-1doc/CHANGES-2019
+2-11 files

NetBSD/pkgsrc O5Ebtiqmisc/py-anita distinfo DESCR

   misc/py-anita: update to 2.0.

   Changes from 1.49:

   In the test suite, run the tests in parallel to reduce the run time.

   Downloads can now be interrupted using SIGINT (control-C).

   On NetBSD, invoke makefs using its absolute path /usr/sbin/makefs
   as /usr/sbin may not be in PATH.

   Add support for Python 3.

   When using qemu from pkgsrc, log the exact pkgsrc version of qemu and
   glib2, including any nb suffix.

LLVM/llvm 372201llvm/trunk/include/llvm/Support FileUtilities.h, llvm/trunk/lib/Support FileUtilities.cpp

[Support] Replace function with function_ref in writeFileAtomically. NFC

Summary:
The latter is slightly more efficient and communicates the intent of the
API: writeFileAtomically does not own or copy the callback, it merely
calls it at some point.

Reviewers: jkorous

Reviewed By: jkorous

Subscribers: hiraditya, dexonsmith, jfb, llvm-commits, cfe-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D67584

NetBSD/src WQBYMUlsys/netinet6 nd6_nbr.c

   nd6: remove extra pserialize_read_exit
VersionDeltaFile
1.173+2-3sys/netinet6/nd6_nbr.c
+2-31 files

FreeBSD/doc 53419head/en_US.ISO8859-1/books/porters-handbook/special chapter.xml

Change "use" to "uses" and "a" to "an".

PR:            240655
Submitted by:   pauamma at gundo.com

FreeBSD/doc 53418head/en_US.ISO8859-1/books/handbook/x11 chapter.xml

Fix wording which was wrong ("the some") and
remove another superfluous word in the same
sentence while here.  Put a sentence stop after
the command to split this long sentence into two.

PR:                240656
Submitted by:       pauamma at gundo.com

FreeBSD/src 352483head/share/mk src.libnames.mk

Add the missing bits for LIBADD to properly function now that
libarchive is linked to libzstd

Pointy hat:     bapt
Reported by:    antoine

FreeBSD/src 352482head Makefile.inc1, head/lib Makefile

Add native support for zstd to libarchive

Note that old pkg will failed to build after this. A recent ports tree (one
providing pkg 1.12+) is required to build. Older already built pkg, should
continue working as expected

PR:            238797
Exp run by:     antoine
Reviewed by:    cem
Approved by:    cem
Differential Revision:  https://reviews.freebsd.org/D20752

FreeBSD/ports 512258head/security/softether Makefile pkg-plist, head/security/softether/files patch-log-db-pid-dir patch-chain-certs-dir

security/softether: make LogFileList command[1] work

properly as well as r512198, r512253. Also config backup function
should work now and use separate PIDDIR from DBDIR.

[1] 
https://www.softether.org/4-docs/1-manual/6._Command_Line_Management_Utility_Manual/6.3_VPN_Server_%2F%2F_VPN_Bridge_Management_Command_Reference_(For_Entire_Server)#6.3.55_.22LogFileList.22:_Get_List_of_Log_Files

Sponsored by:   HAW International, Inc.

FreeBSD/ports 512257head/ports-mgmt/pkg-devel Makefile distinfo

Release pkg 1.12.99.0

Changes from previous devel version:
- Fix crash with bad ABI is provided

Change in the port:
- Do not check anymore for pkg_tools migration to pkg

FreeBSD/ports 512256head/ports-mgmt/pkg distinfo Makefile

Release pkg 1.12.0

- updating: allow to use regular expession in AFFECTS: value
- updating: improve the exact matching for AFFECTS: values
- recommand using pkg bootstrap -f instead of pkg-static install -f to reinstall
  pkg itself
- Add support for lua in package scripts (not documented yet)
- Add support for lua in keywords definition (not documented yet)
- Properly detect when base libarchive is linked to zstd and handle it. (needed
  an upcoming change in base)
- Add a function tu lua script to append message at the run of the pkg process
  along with other messages
- Add the missing warning about @unexec being deprecated for a while now in
  pkg-plist
- Fix build with gmake
- Ensure pkg_shutdown properly reinitialize all the closed fd to -1.
- Do not crash when being passed an unsupported ABI

NetBSD/src F2YwpvVdoc CHANGES-9.0

   Ammend ticket #203 for additional pullups
VersionDeltaFile
1.1.2.53+3-1doc/CHANGES-9.0
+3-11 files

FreeBSD/src 352481stable 11, stable/11/sys/net if_spppsubr.c

MFC r352137:
Callout drain does not have to be followed by a callout stop call.
Fix bogus code.

Sponsored by:   Mellanox Technologies

NetBSD/src RJW1cOzdistrib/sets/lists/comp md.amd64 md.i386

   Additional pull up following revision(s) for ticket #203
   to fix the build:

        distrib/sets/lists/comp/md.amd64: revision 1.273
        distrib/sets/lists/comp/md.i386: revision 1.191

   Add new multiboot2.h header.

FreeBSD/src 352480stable 12, stable/12/sys/net if_spppsubr.c

MFC r352137:
Callout drain does not have to be followed by a callout stop call.
Fix bogus code.

Sponsored by:   Mellanox Technologies

FreeBSD/src 352479stable 11, stable/11/sys/compat/linuxkpi/common/src linux_work.c

MFC r352207:
Use true and false when dealing with bool type in the LinuxKPI.
No functional change.

Sponsored by:          Mellanox Technologies

FreeBSD/src 352478stable 12, stable/12/sys/compat/linuxkpi/common/src linux_work.c

MFC r352207:
Use true and false when dealing with bool type in the LinuxKPI.
No functional change.

Sponsored by:          Mellanox Technologies

FreeBSD/src 352477stable 12, stable/12/sys/compat/linuxkpi/common/src linux_work.c

MFC r352206:
Fix synchronous work drain issue in the LinuxKPI.

A work callback may restart itself. Loop in the drain function to see if the
work has been rescheduled and stop the subsequent reschedules, if any.

Sponsored by:          Mellanox Technologies

FreeBSD/src 352476stable 11, stable/11/sys/compat/linuxkpi/common/src linux_work.c

MFC r352206:
Fix synchronous work drain issue in the LinuxKPI.

A work callback may restart itself. Loop in the drain function to see if the
work has been rescheduled and stop the subsequent reschedules, if any.

Sponsored by:          Mellanox Technologies

FreeBSD/src 352475stable 12, stable/12/sys/amd64/amd64 pmap.c

MFC r350463
  In pmap_advise(), when we encounter a superpage mapping, we first demote
  the mapping and then destroy one of the 4 KB page mappings so that there
  is a potential trigger for repromotion.  Currently, we destroy the first
  4 KB page mapping that falls within the (current) superpage mapping or the
  virtual address range [sva, eva).  However, I have found empirically that
  destroying the last 4 KB mapping produces slightly better results,
  specifically, more promotions and fewer failed promotion attempts.
  Accordingly, this revision changes pmap_advise() to destroy the last 4 KB
  page mapping.  It also replaces some nearby uses of boolean_t with bool.

NetBSD/pkgsrc n3XS6yBlang/rust Makefile

   rust: buildlink with curl; fixes linking on Darwin

   Rust needs cURL with HTTP2 option enabled; when not found, curl will be built
   from internal sources.
VersionDeltaFile
1.116+2-2lang/rust/Makefile
+2-21 files

FreeBSD/src 352474stable 11, stable/11/sys/compat/linuxkpi/common/include/linux interrupt.h

MFC r352205:
Fix broken DECLARE_TASKLET() macro after r347852.

Sponsored by:          Mellanox Technologies

FreeBSD/ports 512255head/x11 Makefile conlecterm, head/x11/conlecterm Makefile distinfo

This is a multi tabbed terminal that uses embedded windows and a gtk
notebook.  Any program that has an option to be embedded can be used
with it.

Possible programs include:
* rxvt-unicode
* xterm
* emacs
* vim

WWW: https://github.com/hxw/conlecterm

Submitted by:   Christopher Hall <hsw at bitmark.com> (via Slack)

FreeBSD/src 352473stable 12, stable/12/sys/arm64/arm64 gicv3_its.c

MFC r340602:

gitv3_its: fixes for multiple GIC ITS blocks

First pass of support for multiple GIC ITS blocks with ACPI.
Changes are to:
 * register the correct subset of interrupts with pic_register
   in case of ACPI.
 * initialize just the cpu interface for the first ITS, when
   domain information is not avialable. This has to be done
   until we split the per-CPU init to do LPI setup just once.
 * remove duplicate check for the GIC ITS domain, the sc_cpus
   are setup from domain, so the check again in per-CPU init
   seems unnecessary.

Reviewed by:    andrew
Differential Revision:  https://reviews.freebsd.org/D17841

NetBSD/pkgsrc EGXJdh7www/curl options.mk Makefile

   curl: http2 is now a suggested option; bump revision
VersionDeltaFile
1.18+2-2www/curl/options.mk
1.218+2-1www/curl/Makefile
+4-32 files

FreeBSD/src 352472stable 12, stable/12/sys/compat/linuxkpi/common/include/linux interrupt.h

MFC r352205:
Fix broken DECLARE_TASKLET() macro after r347852.

Sponsored by:          Mellanox Technologies

FreeBSD/src 352471stable 12, stable/12/sys/dev/acpica acpi.c acpi_resource.c

MFC r340599-r340601

r340599:
acpica, pci_host_generic_acpi: redo pci_host_generic_acpi.c

This is a major update for pci_host_generic_acpi.c, the current
implementation has some gaps that are better fixed up in one go.
The changes are to:
 * Follow x86 method of not adding PCI resources to PCI host bridge in
   ACPI code. This has been moved to pci_host_generic_acpi.c, where we
   walk thru its resources of the host bridge and add them.
 * Fixup code in pci_host_generic_acpi.c to read all decoded ranges
   and update the 'ranges' property. This allows us to share most of
   the code with generic implementation (and the FDT one).
 * Parse and setup IO ranges and bus ranges when walking the resources
   above. Drop most of the changes related to this from acpica code.
 * Add the ECAM memory area as mem resource 0. Implement the logic to
   get the ECAM area from MCFG (using bus range which we now decode),
   or from _CBA (using _BBN/bus range). Drop aarch64 ifdefs from acpica
   code which did part of this.
 * Switch resource activation to similar code as FDT implementation,
   this can be moved into generic implementation in a later pass.
 * Drop the mechanism of using the 7th bit of bus number as the domain,
   this is not correct and will work only in very specific cases. Use
   _SEG as PCI domain and use the bus ranges of the host bridge to

    [27 lines not shown]

pkgng/pkgng c7fc05e. auto.def NEWS

Release 1.12.0
DeltaFile
+3-3auto.def
+3-0NEWS
+6-32 files

FreeBSD/src 352470stable 12, stable/12/sys/arm/arm generic_timer.c

MFC r340598:

acpica: rework INTRNG interrupts

On arm64 (where INTRNG is enabled), the interrupts have to be mapped
with ACPI_BUS_MAP_INTR() before adding them as resources to devices.

The earlier code did the mapping before calling acpi_set_resource(),
which bypassed code that checked for PCI link interrupts.

To fix this, move the call to map interrupts into acpi_set_resource()
and that requires additional work to lookup interrupt properties.
The changes here are to:
 * extend acpi_lookup_irq_handler() to lookup an irq in the ACPI
   resources
 * create a helper function acpi_map_intr() which uses the updated
   acpi_lookup_irq_handler() to look up an irq, and then map it
   with ACPI_BUS_MAP_INTR()
 * use acpi_map_intr() in acpi_pcib_route_interrupt() to map
   pci link interrupts.

With these changes, we can drop the ifdefs in acpi_resource.c, and
we can also drop the call for mapping interrupts in generic_timer.c

Reviewed by:    andrew
Differential Revision:  https://reviews.freebsd.org/D17790