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)

LLVM/llvm 364510llvm/trunk/include/llvm/CodeGen/GlobalISel CallLowering.h, llvm/trunk/lib/CodeGen/GlobalISel CallLowering.cpp

[GlobalISel] Accept multiple vregs in lowerFormalArgs

Change the interface of CallLowering::lowerFormalArguments to accept
several virtual registers for each formal argument, instead of just one.
This is a follow-up to D46018.

CallLowering::lowerReturn was similarly refactored in D49660. lowerCall
will be refactored in the same way in follow-up patches.

With this change, we forward the virtual registers generated for
aggregates to CallLowering. Therefore, the target can decide itself
whether it wants to handle them as separate pieces or use one big
register. We also copy the pack/unpackRegs helpers to CallLowering to
facilitate this.

ARM and AArch64 have been updated to use the passed in virtual registers
directly, which means we no longer need to generate so many
merge/extract instructions.

AArch64 seems to have had a bug when lowering e.g. [1 x i8*], which was
put into a s64 instead of a p0. Added a test-case which illustrates the
problem more clearly (it crashes without this patch) and fixed the
existing test-case to expect p0.

AMDGPU has been updated to unpack into the virtual registers for

    [10 lines not shown]

LLVM/llvm 364509llvm/trunk/include/llvm/CodeGen/GlobalISel CallLowering.h, llvm/trunk/lib/CodeGen/GlobalISel CallLowering.cpp

[GlobalISel] Allow multiple VRegs in ArgInfo. NFC

Allow CallLowering::ArgInfo to contain more than one virtual register.
This is useful when passes split aggregates into several virtual
registers, but need to also provide information about the original type
to the call lowering. Used in follow-up patches.

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

pkgng/pkgng f45a01bsrc updating.c

Allow to use regular expressions in AFFECTS: value.
Pkg updating collects package names which is indicated by regular expressions.
DeltaFile
+121-2src/updating.c
+121-21 files

pkgng/pkgng 292e2fbsrc updating.c, tests/frontend updating.sh

fix to match more exactly.
This makes 'print/cups' not to match 'print/cups-base'.

pkgng/pkgng a4e9278src updating.c

Convert regular expression.
In UPDATING file, simplified regular expression is used.
So we convert to POSIX 1003.2 style mentioned in re_format(4).
DeltaFile
+55-3src/updating.c
+55-31 files

pkgng/pkgng ffa76c0tests Makefile.autosetup, tests/frontend updating.sh Kyuafile.in

add test of `pkg updating`

LLVM/llvm 364508llvm/trunk/lib/Target/AMDGPU AMDGPUAsmPrinter.cpp, llvm/trunk/test/CodeGen/AMDGPU debug.ll

[AMDGPU] Fix +DumpCode to print an entry label for the first function

Summary:
The +DumpCode attribute is a horrible hack in AMDGPU to embed the
disassembly of the generated code into the elf file. It is used by LLPC
to implement an extension that allows the application to read back the
disassembly of the code.

It tries to print an entry label at the start of every function, but
that didn't work for the first function in the module because
DumpCodeInstEmitter wasn't initialised until EmitFunctionBodyStart
which is too late.

Change-Id: I790d73ddf4f51fd02ab32529380c7cb7c607c4ee

Reviewers: arsenm, tpr, kzhuravl

Reviewed By: arsenm

Subscribers: arsenm, kzhuravl, jvesely, wdng, nhaehnle, yaxunl, dstuttard, tpr, t-tye, 
llvm-commits

Tags: #llvm

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

LLVM/llvm 364507llvm/trunk/lib/Target/X86 X86ISelLowering.cpp

Silence gcc warning after r364458

Without the fix gcc 7.4.0 complains with

../lib/Target/X86/X86ISelLowering.cpp: In function 'bool getFauxShuffleMask(llvm::SDValue, 
llvm::SmallVectorImpl<int>&, llvm::SmallVectorImpl<llvm::SDValue>&, llvm::SelectionDAG&)':
../lib/Target/X86/X86ISelLowering.cpp:6690:36: error: enumeral and non-enumeral type in 
conditional expression [-Werror=extra]
             int Idx = (ZeroMask[j] ? SM_SentinelZero : (i + j + Ofs));
                        ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1plus: all warnings being treated as errors

LLVM/llvm 364506llvm/trunk/include/llvm/CodeGen MIRYamlMapping.h MachineFunction.h, llvm/trunk/lib/CodeGen MIRPrinter.cpp

[MachineFunction] Base support for call site info tracking

Add an attribute into the MachineFunction that tracks call site info.

([8/13] Introduce the debug entry values.)

Co-authored-by: Ananth Sowda <asowda at cisco.com>
Co-authored-by: Nikola Prica <nikola.prica at rt-rk.com>
Co-authored-by: Ivan Baev <ibaev at cisco.com>

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

FreeBSD/ports 505198head/lang/yabasic distinfo Makefile

- Update to 2.83.1

LLVM/llvm 364505llvm/trunk/lib/Bitcode/Reader BitcodeReader.cpp

Fix -Wunused-variable warnings after r364464

/work/llvm.monorepo/llvm/lib/Bitcode/Reader/BitcodeReader.cpp: In function
‘llvm::Expected<std::basic_string<char> > 
readIdentificationBlock(llvm::BitstreamCursor&)’:
/work/llvm.monorepo/llvm/lib/Bitcode/Reader/BitcodeReader.cpp:205:22:
warning: unused variable ‘BitCode’ [-Wunused-variable]
     switch (unsigned BitCode = MaybeBitCode.get()) {
                      ^
/work/llvm.monorepo/llvm/lib/Bitcode/Reader/BitcodeReader.cpp: In member function
‘llvm::Error {anonymous}::ModuleSummaryIndexBitcodeReader::parseModule()’:
/work/llvm.monorepo/llvm/lib/Bitcode/Reader/BitcodeReader.cpp:5367:26:
warning: unused variable ‘BitCode’ [-Wunused-variable]
         switch (unsigned BitCode = MaybeBitCode.get()) {
                          ^

LLVM/llvm 364504llvm/trunk/include/llvm/Bitcode BitstreamReader.h

Fix GCC 4 build after r364464

It was failing with:

In file included from 
/b/s/w/ir/cache/builder/src/third_party/llvm/llvm/lib/Bitcode/Reader/BitstreamReader.cpp:9:0:
/b/s/w/ir/cache/builder/src/third_party/llvm/llvm/include/llvm/Bitcode/BitstreamReader.h:
In member function 'llvm::Expected<long unsigned int> 
llvm::SimpleBitstreamCursor::ReadVBR64(unsigned int)':
/b/s/w/ir/cache/builder/src/third_party/llvm/llvm/include/llvm/Bitcode/BitstreamReader.h:262:14:
error: could not convert 'MaybeRead' from 'llvm::Expected<unsigned int>' to 
'llvm::Expected<long unsigned int>'
       return MaybeRead;
              ^
/b/s/w/ir/cache/builder/src/third_party/llvm/llvm/include/llvm/Bitcode/BitstreamReader.h:279:16:
error: could not convert 'MaybeRead' from 'llvm::Expected<unsigned int>' to 
'llvm::Expected<long unsigned int>'
         return MaybeRead;
                ^

OpenBSD/ports sYhW24swww/bozohttpd Makefile distinfo

   Update to bozohttpd-20190228.
VersionDeltaFile
1.25+3-3www/bozohttpd/Makefile
1.18+2-2www/bozohttpd/distinfo
+5-52 files

OpenBSD/ports QQBjY9Csysutils/random_run Makefile distinfo

   minor update

OpenBSD/ports PqHlIeRgraphics/aspect-crop Makefile distinfo

   minor update

FreeBSD/ports 505197head/textproc/py-mako distinfo Makefile

- Update to 1.0.12

FreeBSD/ports 505196head/www/elgg pkg-plist distinfo

- Update to 3.0.4

LLVM/llvm 364503lldb/trunk/source/Plugins/ABI/SysV-x86_64 ABISysV_x86_64.cpp

[lldb] [Plugins/SysV-x86_64] NetBSD is also using SysV ABI

Reenable SysV x86_64 ABI usage on NetBSD that was accidentally removed
in r364216.  This fixes numerous test failures with messages similar
to the following:

  error: Can't run the expression locally: Interpreter doesn't handle
  one of the expression's opcodes

LLVM/llvm 364502cfe/trunk/include/clang/AST Decl.h, cfe/trunk/lib/CodeGen CGDebugInfo.cpp CGExpr.cpp

[clang] Add DISuprogram and DIE for a func decl

Attach a unique DISubprogram to a function declaration that will be
used for call site debug info.

([7/13] Introduce the debug entry values.)

Co-authored-by: Ananth Sowda <asowda at cisco.com>
Co-authored-by: Nikola Prica <nikola.prica at rt-rk.com>
Co-authored-by: Ivan Baev <ibaev at cisco.com>

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

OpenBSD/src 1IrouM8bin/ed io.c

   Be precise in checking for errors. pclose(3) returns -1 and fclose(3)
   EOF in case of errors, not any negative number.
   EOF corner case spotted while reviewing a much bigger diff by deraadt

   OK deraadt, millert
VersionDeltaFile
1.23+3-3bin/ed/io.c
+3-31 files

OpenBSD/src LNdVd4Nusr.bin/ssh sshkey.c

   fix NULL deference (bzero) on error path added in last commit;
   spotted by Reynir Björnsson

   ok deraadt@ markus@ tb@
VersionDeltaFile
1.78+2-2usr.bin/ssh/sshkey.c
+2-21 files

HardenedBSD/hardenedbsd 0b86fb3contrib/ipfilter/man ipmon.8, contrib/ipfilter/tools ipmon.c

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

* freebsd/current/master:
  Return a return code scripts might expect. I missed this while reviewing and rewriting a 
patch in PR/238816.
  Update usage() to refect the current state of ipmon.
  Add the ipmon.5 man page.
  Fix a typo.

LLVM/llvm 364501llvm/trunk/utils/gn/secondary/clang/lib/Tooling/DependencyScanning BUILD.gn, llvm/trunk/utils/gn/secondary/llvm/lib/DebugInfo/GSYM BUILD.gn

gn build: Follow-up to r364491 "[GN] Update build files"

- Merge r364427 (GSYM lib) more: It was missing the new unit test
  (as pointed out by llvm/utils/gn/build/sync_source_lists_from_cmake.py),
  and it had some superfluous deps not present in the cmake build.

- Merge r364474 (clang DependencyScanning lib) more: The deps didn't
  quite match cmake.

LLVM/llvm 364500llvm/trunk/docs LangRef.rst, llvm/trunk/lib/CodeGen/AsmPrinter DwarfDebug.cpp

[IR] Add DISuprogram and DIE for a func decl

A unique DISubprogram may be attached to a function declaration used for
call site debug info.

([6/13] Introduce the debug entry values.)

Co-authored-by: Ananth Sowda <asowda at cisco.com>
Co-authored-by: Nikola Prica <nikola.prica at rt-rk.com>
Co-authored-by: Ivan Baev <ibaev at cisco.com>

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

NetBSD/src xQ8zdkjsys/dev/pci/ixgbe ixgbe_x550.c

   Sync with FreeBSD ix-3.3.8 part 2:
   - Add missing XFI support into ixgbe_get_link_capabilities_X550em().
VersionDeltaFile
1.15+7-1sys/dev/pci/ixgbe/ixgbe_x550.c
+7-11 files

NetBSD/src SLLxCLusys/dev/pci/ixgbe ixgbe_common.c if_sriov.c

   Sync with FreeBSD ix-3.3.8 part 1. No functional change in this part:
    - Move ixgbe_toggle_txdctl() to ixgbe_common.c and modify a bit.
      No functional change because this function is currently used for SR-IOV
      and it's not used in NetBSD.
    - Some modification to match the latest netmap API.
    - Modify ixgbe_hic_unlocked(). No functional change because neither
      IXGBE_HOST_INTERFACE_APPLY_UPDATE_CMD(0x38) nor
      IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD(0x31) are used.
    - Add ixgbe_clear_mbx(). No functional change because this function is not
      used yet.
    - Add some not-yet-used register definitions.
    - Whitespace fixes.

LLVM/llvm 364499llvm/trunk/lib/Target/X86 X86ISelDAGToDAG.cpp

[X86] Remove (vzext_movl (scalar_to_vector (load))) matching code from 
selectScalarSSELoad.

I think this will be turning into vzext_load during DAG combine.

LLVM/llvm 364498llvm/trunk/lib/Target/X86 X86ISelDAGToDAG.cpp, llvm/trunk/test/CodeGen/X86 fold-load-unops.ll

[X86] Teach selectScalarSSELoad to not narrow volatile loads.

LLVM/llvm 364497llvm/trunk/test/Transforms/InstCombine signbit-lshr-and-icmpeq-zero.ll signbit-shl-and-icmpeq-zero.ll

[InstCombine][NFCI] Fix test comments.

For fold
(X & (signbit l>> Y)) ==/!= 0 -> (X << Y) >=/< 0
(X & (signbit << Y)) ==/!= 0 -> (X l>> Y) >=/< 0

Test cases of X being constant are positive tests not negative.

Prep work for D62818.

FreeBSD/ports 505195head/sysutils Makefile syslog-ng322, head/sysutils/syslog-ng Makefile

Accpet the new syslog-ng321 from our upstream Balabit, the company
that authored and maintains syslog-ng.

Peter suggested that this new port not become the default syslog-ng port
for now until up two modules that fail to build on FreeBSD are fixed
upstream.

Submitted by:   Peter Czanik (CzP) <peter.czanik at balabit.com>
               Balabit (a OneIdentity company) / syslog-ng upstream

OpenBSD/src XxolBZ1lib/libc/asr gethostnamadr_async.c

   If we don't receive a reply packet the res_send subquery will already have
   set subq_h_errno and ar_count. Remove the ar_datalen == -1 check, so we
   set ar_h_errno and don't have to (wrongly) guess that
   ar_h_errno = HOST_NOT_FOUND.

   This makes sure that if no nameserver responds the h_errno value is set to
   TRY_AGAIN instead of HOST_NOT_FOUND.

   OK eric@, deraadt@
VersionDeltaFile
1.45+5-7lib/libc/asr/gethostnamadr_async.c
+5-71 files

OpenBSD/src Lw8fDOJusr.sbin/smtpd smtpd.c lka_proc.c

   Allow filters to log information through stderr. This simplifies and
   unifies the way filters need to get their logging to the right location.

   Log-messages are read line by line and are logged at LOG_ERR level via
   the lookup process.

   OK gilles@

OpenBSD/ports cX4QsvYsecurity/polarssl Makefile distinfo, security/polarssl/patches patch-CMakeLists_txt

   Update to mbedtls-2.16.2.

   Maintenance release. Release notes can be found at
   https://tls.mbed.org/tech-updates/releases/mbedtls-2.16.2-and-2.7.11-released

   Bump minor of libmbedx509 as symbols have been added.

NetBSD/pkgsrc-wip 552e505cataclysm-dda PLIST distinfo, cataclysm-dda/patches patch-Makefile patch-src_player.cpp

cataclysm-dda: update to cataclysm-dda-0.13

= 0.D (Danny)

== Highlights:

Many quality of life enhancements such as auto-pulp, autopickup, batch actions,
interacting with adjacent items and improved long-action handling.
Pixel minimap for tiles mode.
Guns accept magazines when appropriate.
Player stamina stat that is burned by running and other physical exertion.
Player faction base that allows incremental growth and autonomous work by NPCs.
The player remembers terrain and furniture they have seen.
Carrying racks for small vehicles.
Vehicle system (speed, fuel consumption, terrain effects) overhaul.
Overhauled nutrition, food spoilage and food state changes (freezing).
Overhauled bomb fragment handling.
NPC dialogue support, group commands, tactical instructions and backstories.
Dynamic Lighting.
Roughly DOUBLED the amount of in-game content.
Unheard-of levels of bugfixing.
Full translations for Chinese, German, Japanese, Polish and Russian.

== Features:


    [1472 lines not shown]

OpenBSD/src t5Ph2sVregress/lib/libcrypto/base64 base64test.c

   check for asprintf failing allocation

HardenedBSD/hardenedbsd 792bf48sys/amd64/vmm vmm_instruction_emul.c

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

* freebsd/12-stable/master:
  MFC: r347065 (by jhb) Emulate the "ADD reg, r/m" instruction (opcode 03H).

HardenedBSD/hardenedbsd 83060b2contrib/ipfilter/tools ipmon.c

Return a return code scripts might expect. I missed this while
reviewing and rewriting a patch in PR/238816.

PR:            238816
Reported by:    rgrimes@
Pointy hat to:  cy@
MFC after:      1 week
X-MFC with:     r349450

FreeBSD/src 349451head/contrib/ipfilter/tools ipmon.c

Return a return code scripts might expect. I missed this while
reviewing and rewriting a patch in PR/238816.

PR:            238816
Reported by:    rgrimes@
Pointy hat to:  cy@
MFC after:      1 week
X-MFC with:     r349450

LLVM/llvm 364496llvm/trunk/lib/Target/PowerPC PPCEarlyReturn.cpp

[NFC][PowerPC] Improve the for loop in Early Return

Summary:

In `PPCEarlyReturn.cpp`
```
183       for (MachineFunction::iterator I = MF.begin(); I != MF.end();) {
184         MachineBasicBlock &B = *I++;
185         if (processBlock(B))
186           Changed = true;
187       }
```
Above code can be improved to:
```
184       for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E;) {
185         MachineBasicBlock &B = *I++;
186         Changed |= processBlock(B);
187       }
```

Reviewed By: hfinkel

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

FreeBSD/ports 505194head/cad/sumo pkg-plist Makefile, head/graphics/libgeotiff pkg-plist

- Update to 6.1.0 and fix some ports
- Add missing DEPENDS
- Add TEST_TARGET
- Take maintainership

PR:            237932, 238795
Submitted by:   wenheping2000 at hotmail.com,rhurlin at gwdg.de
Approved by:    maintainer(timeout, > 30 days), portmgr@(implicit, fix build)
Exp-run by:     antoine@
Thanks to:      antoine@, sunpoet@, rhurlin at gwdg.de

FreeBSD/ports 505193head/graphics/p5-Geo-Proj4 Makefile, head/misc/survex Makefile

- Change DEPENDS from graphics/proj to graphics/proj5
- Mark DEPRECATED and set EXPIRATION_DATE

PR:            237932
Submitted by:   wenheping2000 at hotmail.com(myself)
Approved by:    portmgr@(implicit, fix build)

NetBSD/pkgsrc-wip c51fc97. Makefile

Makefile: Add colm-devel
DeltaFile
+1-0Makefile
+1-01 files

NetBSD/pkgsrc-wip efe7740colm-devel PLIST Makefile

colm-devel: import colm-0.13.0.7

Colm is a programming language designed for the analysis and
transformation of computer languages. Colm is influenced primarily by
TXL. It is in the family of program transformation languages.

NetBSD/src m4BQx5nsys/compat/sys rnd.h

   This actually needs the netbsd32 stuff present since the struct for the
   32 bit syscall has a netbsd32_voidp... This header is used also for
   compat/common, so just revert (helped us to fix a bug though :-)
VersionDeltaFile
1.7+17-8sys/compat/sys/rnd.h
+17-81 files

FreeBSD/src 349450head/contrib/ipfilter/tools ipmon.c

Update usage() to refect the current state of ipmon.

PR:            238816
MFC after:      1 week

HardenedBSD/hardenedbsd a61d951contrib/ipfilter/tools ipmon.c

Update usage() to refect the current state of ipmon.

PR:            238816
MFC after:      1 week

FreeBSD/src 349449head/sbin/ipf/ipmon Makefile, head/tools/build/mk OptionalObsoleteFiles.inc

Add the ipmon.5 man page.

PR/238816 initially addressed updates to usage() however the PR has
morphed into a shopping list of updates to usage() and man pages.

PR:            238816 (I added to the list during discussion)
MFC after:      1 week

HardenedBSD/hardenedbsd 5f37c68sbin/ipf/ipmon Makefile, tools/build/mk OptionalObsoleteFiles.inc

Add the ipmon.5 man page.

PR/238816 initially addressed updates to usage() however the PR has
morphed into a shopping list of updates to usage() and man pages.

PR:            238816 (I added to the list during discussion)
MFC after:      1 week