FreshBSD

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>

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

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

[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]

[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

Allow to use regular expressions in AFFECTS: value.
Pkg updating collects package names which is indicated by regular expressions.

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

Convert regular expression.
In UPDATING file, simplified regular expression is used.
So we convert to POSIX 1003.2 style mentioned in re_format(4).

add test of `pkg updating`

[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

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

[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

- Update to 2.83.1

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()) {
                          ^

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;
                ^

   Update to bozohttpd-20190228.

   minor update

   minor update

- Update to 1.0.12

- Update to 3.0.4

[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

[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

   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

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

   ok deraadt@ markus@ tb@

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.

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.

[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

   Sync with FreeBSD ix-3.3.8 part 2:
   - Add missing XFI support into ixgbe_get_link_capabilities_X550em().

   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.

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

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

[X86] Teach selectScalarSSELoad to not narrow volatile loads.

[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.

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

   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@

   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@

   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.

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]

   check for asprintf failing allocation

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).

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

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

[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

- 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

- 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)

Makefile: Add colm-devel

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.

   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 :-)

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

PR:            238816
MFC after:      1 week

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

PR:            238816
MFC after:      1 week

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

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