svn commit: r359528 - stable/12/sys/dev/mlx5/mlx5_core

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 19:06:26 2020
New Revision: 359528
URL: https://svnweb.freebsd.org/changeset/base/359528

Log:
  MFC r359094:
  mlx5_core: add sysctls to report device capabilities.

Modified:
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
==
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.cWed Apr  1 17:19:27 
2020(r359527)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.cWed Apr  1 19:06:26 
2020(r359528)
@@ -1297,6 +1297,9 @@ static int init_one(struct pci_dev *pdev,
int i,err;
struct sysctl_oid *pme_sysctl_node;
struct sysctl_oid *pme_err_sysctl_node;
+   struct sysctl_oid *cap_sysctl_node;
+   struct sysctl_oid *current_cap_sysctl_node;
+   struct sysctl_oid *max_cap_sysctl_node;
 
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
priv = >priv;
@@ -1364,6 +1367,186 @@ static int init_one(struct pci_dev *pdev,
0, mlx5_pme_err_desc[2 * i + 1]);
}
 
+   cap_sysctl_node = SYSCTL_ADD_NODE(>sysctl_ctx,
+   SYSCTL_CHILDREN(device_get_sysctl_tree(bsddev)),
+   OID_AUTO, "caps", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
+   "hardware capabilities raw bitstrings");
+   if (cap_sysctl_node == NULL) {
+   err = -ENOMEM;
+   goto clean_sysctl_ctx;
+   }
+   current_cap_sysctl_node = SYSCTL_ADD_NODE(>sysctl_ctx,
+   SYSCTL_CHILDREN(cap_sysctl_node),
+   OID_AUTO, "current", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
+   "");
+   if (current_cap_sysctl_node == NULL) {
+   err = -ENOMEM;
+   goto clean_sysctl_ctx;
+   }
+   max_cap_sysctl_node = SYSCTL_ADD_NODE(>sysctl_ctx,
+   SYSCTL_CHILDREN(cap_sysctl_node),
+   OID_AUTO, "max", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
+   "");
+   if (max_cap_sysctl_node == NULL) {
+   err = -ENOMEM;
+   goto clean_sysctl_ctx;
+   }
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(current_cap_sysctl_node),
+   OID_AUTO, "general", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_cur[MLX5_CAP_GENERAL],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(max_cap_sysctl_node),
+   OID_AUTO, "general", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_max[MLX5_CAP_GENERAL],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(current_cap_sysctl_node),
+   OID_AUTO, "ether", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_cur[MLX5_CAP_ETHERNET_OFFLOADS],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(max_cap_sysctl_node),
+   OID_AUTO, "ether", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_max[MLX5_CAP_ETHERNET_OFFLOADS],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(current_cap_sysctl_node),
+   OID_AUTO, "odp", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_cur[MLX5_CAP_ODP],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(max_cap_sysctl_node),
+   OID_AUTO, "odp", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_max[MLX5_CAP_ODP],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(current_cap_sysctl_node),
+   OID_AUTO, "atomic", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_cur[MLX5_CAP_ATOMIC],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(max_cap_sysctl_node),
+   OID_AUTO, "atomic", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_max[MLX5_CAP_ATOMIC],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(current_cap_sysctl_node),
+   OID_AUTO, "roce", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_cur[MLX5_CAP_ROCE],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(max_cap_sysctl_node),
+   OID_AUTO, "roce", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_max[MLX5_CAP_ROCE],
+   MLX5_UN_SZ_DW(hca_cap_union) * sizeof(u32), "IU", "");
+   SYSCTL_ADD_OPAQUE(>sysctl_ctx,
+   SYSCTL_CHILDREN(current_cap_sysctl_node),
+   OID_AUTO, "ipoib", CTLFLAG_RD | CTLFLAG_MPSAFE,
+   >hca_caps_cur[MLX5_CAP_IPOIB_OFFLOADS],
+

svn commit: r359507 - head/usr.sbin/autofs

2020-04-01 Thread Edward Tomasz Napierala 
Author: trasz
Date: Wed Apr  1 15:08:13 2020
New Revision: 359507
URL: https://svnweb.freebsd.org/changeset/base/359507

Log:
  Stop hardcoding WARNS in automount(8) et al.
  
  MFC after:2 weeks
  Sponsored by: DARPA

Modified:
  head/usr.sbin/autofs/Makefile

Modified: head/usr.sbin/autofs/Makefile
==
--- head/usr.sbin/autofs/Makefile   Wed Apr  1 13:18:01 2020
(r359506)
+++ head/usr.sbin/autofs/Makefile   Wed Apr  1 15:08:13 2020
(r359507)
@@ -24,8 +24,6 @@ LIBADD=   util
 MOUNT=  ${SRCTOP}/sbin/mount
 CFLAGS+=-I${MOUNT}
 
-WARNS= 6
-
 LINKS= ${BINDIR}/automountd ${BINDIR}/automount
 LINKS+=${BINDIR}/automountd ${BINDIR}/autounmountd
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359504 - head/lib/libc/locale

2020-04-01 Thread Rodney W. Grimes 
> Author: 0mp (doc,ports committer)
> Date: Wed Apr  1 09:01:35 2020
> New Revision: 359504
> URL: https://svnweb.freebsd.org/changeset/base/359504
> 
> Log:
>   Use proper mdoc(7) macros for literal text and do not use Tn
>   
>   Tn is deprecated and upsets linters.
>   

I know I am way late to the game on this, but those of us who have
actually produced phototype output using groff of the man pages in
the past value the .Tn macro.  I can not phantom what would
of been so hard to implement that this had to be depricated by mdoc
simply render the argument as standard characters as groff did in
the past when the output device was of type ascii.

>   MFC after:  3 days
> 
> Modified:
>   head/lib/libc/locale/big5.5
> 
> Modified: head/lib/libc/locale/big5.5
> ==
> --- head/lib/libc/locale/big5.5   Wed Apr  1 07:28:31 2020
> (r359503)
> +++ head/lib/libc/locale/big5.5   Wed Apr  1 09:01:35 2020
> (r359504)
> @@ -24,7 +24,7 @@
>  .\"
>  .\" $FreeBSD$
>  .\"
> -.Dd September 12, 2019
> +.Dd April 1, 2020
>  .Dt BIG5 5
>  .Os
>  .Sh NAME
> @@ -39,9 +39,8 @@ encoding for Traditional Chinese text
>  .Dq Big Five
>  is a standard for encoding Traditional Chinese text.
>  Each character is represented by either one or two bytes.
> -Characters from the
> -.Tn ASCII
> -character set are represented as single bytes in the range 0x00 - 0x7F.
> +Characters from the ASCII character set are represented as
> +single bytes in the range 0x00 - 0x7F.
>  Traditional Chinese characters are represented by two bytes:
>  the first in the range 0xA1 - 0xFE, the second in the range
>  0x40 - 0xFE.
> @@ -51,7 +50,11 @@ the first in the range 0xA1 - 0xFE, the second in the 
>  .Xr utf8 5
>  .Sh BUGS
>  The range of the second byte overlaps some ASCII characters, including
> -0x5C (`\\') and 0x7C (`|') which may cause problems in program execution or
> +0x5C
> +.Pq Ql \e
> +and 0x7C
> +.Pq Ql |
> +which may cause problems in program execution or
>  display.
>  Big5 is considered a legacy standard and only preserved for backward
>  compatibility reason.
> 

-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359525 - in stable/12/sys/compat/linuxkpi/common: include/linux src

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 17:13:43 2020
New Revision: 359525
URL: https://svnweb.freebsd.org/changeset/base/359525

Log:
  MFC r359096, r359165 (by imp):
  linuxkpi: Add infrastructure to pass FreeBSD IOV method calls into
  pci_driver methods.

Modified:
  stable/12/sys/compat/linuxkpi/common/include/linux/pci.h
  stable/12/sys/compat/linuxkpi/common/src/linux_pci.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/pci.h
==
--- stable/12/sys/compat/linuxkpi/common/include/linux/pci.hWed Apr  1 
17:09:21 2020(r359524)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/pci.hWed Apr  1 
17:13:43 2020(r359525)
@@ -37,8 +37,10 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -201,6 +203,11 @@ struct pci_driver {
struct device_driverdriver;
const struct pci_error_handlers   *err_handler;
boolisdrm;
+   int  (*bsd_iov_init)(device_t dev, uint16_t num_vfs,
+   const nvlist_t *pf_config);
+   void  (*bsd_iov_uninit)(device_t dev);
+   int  (*bsd_iov_add_vf)(device_t dev, uint16_t vfnum,
+   const nvlist_t *vf_config);
 };
 
 struct pci_bus {

Modified: stable/12/sys/compat/linuxkpi/common/src/linux_pci.c
==
--- stable/12/sys/compat/linuxkpi/common/src/linux_pci.cWed Apr  1 
17:09:21 2020(r359524)
+++ stable/12/sys/compat/linuxkpi/common/src/linux_pci.cWed Apr  1 
17:13:43 2020(r359525)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -45,6 +46,10 @@ __FBSDID("$FreeBSD$");
 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -64,6 +69,9 @@ static device_detach_t linux_pci_detach;
 static device_suspend_t linux_pci_suspend;
 static device_resume_t linux_pci_resume;
 static device_shutdown_t linux_pci_shutdown;
+static pci_iov_init_t linux_pci_iov_init;
+static pci_iov_uninit_t linux_pci_iov_uninit;
+static pci_iov_add_vf_t linux_pci_iov_add_vf;
 
 static device_method_t pci_methods[] = {
DEVMETHOD(device_probe, linux_pci_probe),
@@ -72,6 +80,9 @@ static device_method_t pci_methods[] = {
DEVMETHOD(device_suspend, linux_pci_suspend),
DEVMETHOD(device_resume, linux_pci_resume),
DEVMETHOD(device_shutdown, linux_pci_shutdown),
+   DEVMETHOD(pci_iov_init, linux_pci_iov_init),
+   DEVMETHOD(pci_iov_uninit, linux_pci_iov_uninit),
+   DEVMETHOD(pci_iov_add_vf, linux_pci_iov_add_vf),
DEVMETHOD_END
 };
 
@@ -268,6 +279,47 @@ linux_pci_shutdown(device_t dev)
if (pdev->pdrv->shutdown != NULL)
pdev->pdrv->shutdown(pdev);
return (0);
+}
+
+static int
+linux_pci_iov_init(device_t dev, uint16_t num_vfs, const nvlist_t *pf_config)
+{
+   struct pci_dev *pdev;
+   int error;
+
+   linux_set_current(curthread);
+   pdev = device_get_softc(dev);
+   if (pdev->pdrv->bsd_iov_init != NULL)
+   error = pdev->pdrv->bsd_iov_init(dev, num_vfs, pf_config);
+   else
+   error = EINVAL;
+   return (error);
+}
+
+static void
+linux_pci_iov_uninit(device_t dev)
+{
+   struct pci_dev *pdev;
+
+   linux_set_current(curthread);
+   pdev = device_get_softc(dev);
+   if (pdev->pdrv->bsd_iov_uninit != NULL)
+   pdev->pdrv->bsd_iov_uninit(dev);
+}
+
+static int
+linux_pci_iov_add_vf(device_t dev, uint16_t vfnum, const nvlist_t *vf_config)
+{
+   struct pci_dev *pdev;
+   int error;
+
+   linux_set_current(curthread);
+   pdev = device_get_softc(dev);
+   if (pdev->pdrv->bsd_iov_add_vf != NULL)
+   error = pdev->pdrv->bsd_iov_add_vf(dev, vfnum, vf_config);
+   else
+   error = EINVAL;
+   return (error);
 }
 
 static int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359503 - in head

2020-04-01 Thread Cy Schubert 
On March 31, 2020 10:53:14 PM PDT, Glen Barber  wrote:
>Author: gjb
>Date: Wed Apr  1 05:51:46 UTC 2020
>New Revision: 359503
>URL: https://svnweb.freebsd.org/changeset/base/359503
>
>Log:
>  Update head to 14.0-CURRENT in order to prevent having
>  a 13.0-RELEASE.
>
>Modified:
>  Makefile.inc1
>  UPDATING
>  lib/clang/freebsd_cc_version.h
>  lib/clang/llvm.build.mk
>  sys/conf/newvers.sh
>  sys/sys/param.h
>
>Index: Makefile.inc1
>===
>--- Makefile.inc1  (revision 359501)
>+++ Makefile.inc1  (working copy)
>@@ -130,9 +130,9 @@ TARGET_ABI=gnueabi
> .endif
> .endif
> MACHINE_ABI?= unknown
>-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
>+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
> TARGET_ABI?=  unknown
>-TARGET_TRIPLE?=   
>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
>+TARGET_TRIPLE?=   
>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
> KNOWN_ARCHES?=aarch64/arm64 \
>   amd64 \
>   armv6/arm \
>@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
> .endif
> 
># flua is required to regenerate syscall files.  It first appeared
>during the
>-# 13.0-CURRENT cycle, thus needs to be built on -older releases and
>stable
>+# 14.0-CURRENT cycle, thus needs to be built on -older releases and
>stable
> # branches.
> .if ${BOOTSTRAPPING} < 1300059
> ${_bt}-libexec/flua: ${_bt}-lib/liblua
>Index: UPDATING
>===
>--- UPDATING   (revision 359501)
>+++ UPDATING   (working copy)
>@@ -11,8 +11,8 @@ handbook:
> Items affecting the ports and packages system can be found in
>/usr/ports/UPDATING.  Please read that file before running portupgrade.
> 
>-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
>-  FreeBSD 13.x has many debugging features turned on, in both the
>kernel
>+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
>+  FreeBSD 14.x has many debugging features turned on, in both the
>kernel
>   and userland.  These features attempt to detect incorrect use of
>   system primitives, and encourage loud failure through extra sanity
>   checking and fail stop semantics.  They also substantially impact
>Index: lib/clang/freebsd_cc_version.h
>===
>--- lib/clang/freebsd_cc_version.h (revision 359501)
>+++ lib/clang/freebsd_cc_version.h (working copy)
>@@ -1,3 +1,3 @@
> /* $FreeBSD$ */
> 
>-#define   FREEBSD_CC_VERSION  137
>+#define   FREEBSD_CC_VERSION  147
>Index: lib/clang/llvm.build.mk
>===
>--- lib/clang/llvm.build.mk(revision 359501)
>+++ lib/clang/llvm.build.mk(working copy)
>@@ -38,7 +38,7 @@ TARGET_ABI=  -gnueabi
> TARGET_ABI=
> .endif
> VENDOR=   unknown
>-OS_VERSION=   freebsd13.0
>+OS_VERSION=   freebsd14.0
> 
>LLVM_TARGET_TRIPLE?=   
>${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
>LLVM_BUILD_TRIPLE?=
>${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
>Index: sys/conf/newvers.sh
>===
>--- sys/conf/newvers.sh(revision 359501)
>+++ sys/conf/newvers.sh(working copy)
>@@ -53,7 +53,7 @@
> #
> 
> TYPE="FreeBSD"
>-REVISION="13.0"
>+REVISION="14.0"
> BRANCH=${BRANCH_OVERRIDE:-CURRENT}
> RELEASE="${REVISION}-${BRANCH}"
> VERSION="${TYPE} ${RELEASE}"
>Index: sys/sys/param.h
>===
>--- sys/sys/param.h(revision 359501)
>+++ sys/sys/param.h(working copy)
>@@ -60,7 +60,7 @@
>  *in the range 5 to 9.
>  */
> #undef __FreeBSD_version
>-#define __FreeBSD_version 1300087 /* Master, propagated to newvers */
>+#define __FreeBSD_version 1400087 /* Master, propagated to newvers */
> 
> /*
>* __FreeBSD_kernel__ indicates that this system uses the kernel of
>FreeBSD,

This was discussed at length just before 12 was released. Are you now the one 
to decide naming, disregarding the discussion?

Should we not have also skipped 4?



-- 
Pardon the typos and autocorrect, small keyboard in use. 
Cy Schubert 
FreeBSD UNIX:  Web: https://www.FreeBSD.org

The need of the many outweighs the greed of the few.

Sent from my Android device with K-9 Mail. Please excuse my brevity.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359514 - head/tools/test/bsnmp

2020-04-01 Thread Hartmut Brandt 
Author: harti
Date: Wed Apr  1 15:39:02 2020
New Revision: 359514
URL: https://svnweb.freebsd.org/changeset/base/359514

Log:
  Add a makefile to build and run the tests for the bsnmp library.
  This is not automatically built or run but must explicitly be built
  with 'make' and run with 'make run'.

Added:
  head/tools/test/bsnmp/
  head/tools/test/bsnmp/Makefile   (contents, props changed)

Added: head/tools/test/bsnmp/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tools/test/bsnmp/Makefile  Wed Apr  1 15:39:02 2020
(r359514)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+CONTRIB=${SRCTOP}/contrib/bsnmp
+.PATH: ${CONTRIB}/tests
+
+PROG_CXX=ctest
+SRCS= main.cc asn1.cc snmp_parse_server.cc
+CFLAGS += -I/${CONTRIB}/lib
+CXXFLAGS+= -std=c++2a
+LIBADD= bsnmp
+
+CFLAGS += -DBOGUS_CVE_2019_5610_FIX
+MK_MAN= no
+
+.include 
+
+
+run:
+   ${.OBJDIR}/ctest
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359523 - stable/12/sys/conf

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 17:08:55 2020
New Revision: 359523
URL: https://svnweb.freebsd.org/changeset/base/359523

Log:
  MFC r359095:
  Add pci_iov_if.h header as a dependency for Linuxkpi consumers.
  
  MFC note: this is not a true merge of r359095, but an adaptation of the
  committed bit from r359378, which was MFC r359185.  The functional part
  of the change should be same.

Modified:
  stable/12/sys/conf/kmod.mk
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/kmod.mk
==
--- stable/12/sys/conf/kmod.mk  Wed Apr  1 16:38:45 2020(r359522)
+++ stable/12/sys/conf/kmod.mk  Wed Apr  1 17:08:55 2020(r359523)
@@ -117,6 +117,7 @@ LINUXKPI_GENSRCS+= \
bus_if.h \
device_if.h \
pci_if.h \
+   pci_iov_if.h \
vnode_if.h \
usb_if.h \
opt_usb.h \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359527 - in stable/11/sys/compat/linuxkpi/common: include/linux src

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 17:19:27 2020
New Revision: 359527
URL: https://svnweb.freebsd.org/changeset/base/359527

Log:
  MFC r359096, r359165 (by imp):
  linuxkpi: Add infrastructure to pass FreeBSD IOV method calls into
  pci_driver methods.

Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/pci.h
  stable/11/sys/compat/linuxkpi/common/src/linux_pci.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/pci.h
==
--- stable/11/sys/compat/linuxkpi/common/include/linux/pci.hWed Apr  1 
17:16:53 2020(r359526)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/pci.hWed Apr  1 
17:19:27 2020(r359527)
@@ -37,8 +37,10 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -189,6 +191,11 @@ struct pci_driver {
struct device_driverdriver;
const struct pci_error_handlers   *err_handler;
boolisdrm;
+   int  (*bsd_iov_init)(device_t dev, uint16_t num_vfs,
+   const nvlist_t *pf_config);
+   void  (*bsd_iov_uninit)(device_t dev);
+   int  (*bsd_iov_add_vf)(device_t dev, uint16_t vfnum,
+   const nvlist_t *vf_config);
 };
 
 struct pci_bus {

Modified: stable/11/sys/compat/linuxkpi/common/src/linux_pci.c
==
--- stable/11/sys/compat/linuxkpi/common/src/linux_pci.cWed Apr  1 
17:16:53 2020(r359526)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_pci.cWed Apr  1 
17:19:27 2020(r359527)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -45,6 +46,10 @@ __FBSDID("$FreeBSD$");
 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -64,6 +69,9 @@ static device_detach_t linux_pci_detach;
 static device_suspend_t linux_pci_suspend;
 static device_resume_t linux_pci_resume;
 static device_shutdown_t linux_pci_shutdown;
+static pci_iov_init_t linux_pci_iov_init;
+static pci_iov_uninit_t linux_pci_iov_uninit;
+static pci_iov_add_vf_t linux_pci_iov_add_vf;
 
 static device_method_t pci_methods[] = {
DEVMETHOD(device_probe, linux_pci_probe),
@@ -72,6 +80,9 @@ static device_method_t pci_methods[] = {
DEVMETHOD(device_suspend, linux_pci_suspend),
DEVMETHOD(device_resume, linux_pci_resume),
DEVMETHOD(device_shutdown, linux_pci_shutdown),
+   DEVMETHOD(pci_iov_init, linux_pci_iov_init),
+   DEVMETHOD(pci_iov_uninit, linux_pci_iov_uninit),
+   DEVMETHOD(pci_iov_add_vf, linux_pci_iov_add_vf),
DEVMETHOD_END
 };
 
@@ -268,6 +279,47 @@ linux_pci_shutdown(device_t dev)
if (pdev->pdrv->shutdown != NULL)
pdev->pdrv->shutdown(pdev);
return (0);
+}
+
+static int
+linux_pci_iov_init(device_t dev, uint16_t num_vfs, const nvlist_t *pf_config)
+{
+   struct pci_dev *pdev;
+   int error;
+
+   linux_set_current(curthread);
+   pdev = device_get_softc(dev);
+   if (pdev->pdrv->bsd_iov_init != NULL)
+   error = pdev->pdrv->bsd_iov_init(dev, num_vfs, pf_config);
+   else
+   error = EINVAL;
+   return (error);
+}
+
+static void
+linux_pci_iov_uninit(device_t dev)
+{
+   struct pci_dev *pdev;
+
+   linux_set_current(curthread);
+   pdev = device_get_softc(dev);
+   if (pdev->pdrv->bsd_iov_uninit != NULL)
+   pdev->pdrv->bsd_iov_uninit(dev);
+}
+
+static int
+linux_pci_iov_add_vf(device_t dev, uint16_t vfnum, const nvlist_t *vf_config)
+{
+   struct pci_dev *pdev;
+   int error;
+
+   linux_set_current(curthread);
+   pdev = device_get_softc(dev);
+   if (pdev->pdrv->bsd_iov_add_vf != NULL)
+   error = pdev->pdrv->bsd_iov_add_vf(dev, vfnum, vf_config);
+   else
+   error = EINVAL;
+   return (error);
 }
 
 static int
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359512 - in head: contrib/bsnmp/lib contrib/bsnmp/snmp_mibII contrib/bsnmp/snmp_usm contrib/bsnmp/snmp_vacm contrib/bsnmp/snmpd contrib/bsnmp/tests lib/libbsnmp/libbsnmp

2020-04-01 Thread Hartmut Brandt 
Author: harti
Date: Wed Apr  1 15:25:16 2020
New Revision: 359512
URL: https://svnweb.freebsd.org/changeset/base/359512

Log:
  Merge release 1.14 of bsnmp.

Added:
  head/contrib/bsnmp/tests/
 - copied from r359490, vendor/bsnmp/dist/tests/
Replaced:
  head/contrib/bsnmp/snmpd/trans_inet.c
 - copied unchanged from r359490, vendor/bsnmp/dist/snmpd/trans_inet.c
  head/contrib/bsnmp/snmpd/trans_inet.h
 - copied unchanged from r359490, vendor/bsnmp/dist/snmpd/trans_inet.h
Modified:
  head/contrib/bsnmp/lib/asn1.c
  head/contrib/bsnmp/lib/bsnmpclient.3
  head/contrib/bsnmp/lib/snmpclient.c
  head/contrib/bsnmp/lib/snmpcrypto.c
  head/contrib/bsnmp/snmp_mibII/mibII.c
  head/contrib/bsnmp/snmp_mibII/mibII.h
  head/contrib/bsnmp/snmp_usm/usm_snmp.c
  head/contrib/bsnmp/snmp_vacm/vacm_snmp.c
  head/contrib/bsnmp/snmpd/snmpd.config
  head/lib/libbsnmp/libbsnmp/Makefile
Directory Properties:
  head/contrib/bsnmp/   (props changed)

Modified: head/contrib/bsnmp/lib/asn1.c
==
--- head/contrib/bsnmp/lib/asn1.c   Wed Apr  1 15:12:51 2020
(r359511)
+++ head/contrib/bsnmp/lib/asn1.c   Wed Apr  1 15:25:16 2020
(r359512)
@@ -65,8 +65,8 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le
return (ASN_ERR_EOBUF);
}
*type = *b->asn_cptr;
-   if ((*type & ASN_TYPE_MASK) > 0x30) {
-   asn_error(b, "types > 0x30 not supported (%u)",
+   if ((*type & ASN_TYPE_MASK) > 0x1e) {
+   asn_error(b, "tags > 0x1e not supported (%#x)",
*type & ASN_TYPE_MASK);
return (ASN_ERR_FAILED);
}
@@ -100,11 +100,19 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le
*len = *b->asn_cptr++;
b->asn_len--;
}
+
+#ifdef BOGUS_CVE_2019_5610_FIX
+   /*
+* This is the fix from CVE-2019-5610.
+*
+* This is the wrong place. Each of the asn functions should check
+* that it has enough info for its own work.
+*/
if (*len > b->asn_len) {
-   asn_error(b, "len %u exceeding asn_len %u", *len, b->asn_len);
+   asn_error(b, "lenen %u exceeding asn_len %u", *len, b->asn_len);
return (ASN_ERR_EOBUF);
}
-   
+#endif
return (ASN_ERR_OK);
 }
 
@@ -147,7 +155,7 @@ asn_put_len(u_char *ptr, asn_len_t len)
 
 /*
  * Write a header (tag and length fields).
- * Tags are restricted to one byte tags (value <= 0x30) and the
+ * Tags are restricted to one byte tags (value <= 0x1e) and the
  * lenght field to 16-bit. All errors stop the encoding.
  */
 enum asn_err
@@ -156,8 +164,8 @@ asn_put_header(struct asn_buf *b, u_char type, asn_len
u_int lenlen;
 
/* tag field */
-   if ((type & ASN_TYPE_MASK) > 0x30) {
-   asn_error(NULL, "types > 0x30 not supported (%u)",
+   if ((type & ASN_TYPE_MASK) > 0x1e) {
+   asn_error(NULL, "types > 0x1e not supported (%#x)",
type & ASN_TYPE_MASK);
return (ASN_ERR_FAILED);
}
@@ -251,9 +259,10 @@ asn_get_real_integer(struct asn_buf *b, asn_len_t len,
return (ASN_ERR_BADLEN);
}
err = ASN_ERR_OK;
-   if (len > 8)
+   if (len > 8) {
+   asn_error(b, "integer too long");
err = ASN_ERR_RANGE;
-   else if (len > 1 &&
+   } else if (len > 1 &&
((*b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) ||
(*b->asn_cptr == 0xff && (b->asn_cptr[1] & 0x80) == 0x80))) {
asn_error(b, "non-minimal integer");
@@ -331,27 +340,35 @@ asn_put_real_integer(struct asn_buf *b, u_char type, i
 static enum asn_err
 asn_get_real_unsigned(struct asn_buf *b, asn_len_t len, uint64_t *vp)
 {
-   enum asn_err err;
-
+   *vp = 0;
if (b->asn_len < len) {
asn_error(b, "truncated integer");
return (ASN_ERR_EOBUF);
}
if (len == 0) {
+   /* X.690: 8.3.1 */
asn_error(b, "zero-length integer");
-   *vp = 0;
return (ASN_ERR_BADLEN);
}
-   err = ASN_ERR_OK;
-   *vp = 0;
-   if ((*b->asn_cptr & 0x80) || (len == 9 && *b->asn_cptr != 0)) {
+   if (len > 1 && *b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) {
+   /* X.690: 8.3.2 */
+   asn_error(b, "non-minimal unsigned");
+   b->asn_cptr += len;
+   b->asn_len -= len;
+   return (ASN_ERR_BADLEN);
+   
+   }
+
+   enum asn_err err = ASN_ERR_OK;
+
+   if ((*b->asn_cptr & 0x80) || len > 9 ||
+   (len == 9 && *b->asn_cptr != 0)) {
/* negative integer or too larger */
*vp = 0xULL;
-   err = ASN_ERR_RANGE;
-   } else if (len > 1 &&
-   *b->asn_cptr == 0x00 &&

Re: svn commit: r359514 - head/tools/test/bsnmp

2020-04-01 Thread Enji Cooper 

> On Apr 1, 2020, at 08:56, Hartmut Brandt  wrote:
> 
> Author: harti
> Date: Wed Apr  1 15:39:02 2020
> New Revision: 359514
> URL: https://svnweb.freebsd.org/changeset/base/359514
> 
> Log:
>  Add a makefile to build and run the tests for the bsnmp library.
>  This is not automatically built or run but must explicitly be built
>  with 'make' and run with 'make run'.

Why was this integrated this way?
-Enji
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359519 - head/release/scripts

2020-04-01 Thread Ed Maste 
Author: emaste
Date: Wed Apr  1 16:03:06 2020
New Revision: 359519
URL: https://svnweb.freebsd.org/changeset/base/359519

Log:
  pkgbase: remove more profile package leftovers
  
  As of r356797 we don't produce profile packages.  r358549 removed one
  remnant of profile package support; clean up another now.

Modified:
  head/release/scripts/mtree-to-plist.awk

Modified: head/release/scripts/mtree-to-plist.awk
==
--- head/release/scripts/mtree-to-plist.awk Wed Apr  1 16:02:42 2020
(r359518)
+++ head/release/scripts/mtree-to-plist.awk Wed Apr  1 16:03:06 2020
(r359519)
@@ -41,7 +41,7 @@
gsub(/package=/, "", pkgname)
} else if (a[i] == "config") {
type="config"
-   } else if (a[i] == "development" || a[i] == "profile" 
|| a[i] == "debug" || a[i] == "docs") {
+   } else if (a[i] == "development" || a[i] == "debug" || 
a[i] == "docs") {
pkgend=a[i]
} else {
if (ext != "")
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359518 - stable/11/sys/x86/x86

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 16:02:42 2020
New Revision: 359518
URL: https://svnweb.freebsd.org/changeset/base/359518

Log:
  MFC r359093:
  Do not spuriously re-enable disabled io_apic pin on EOI for some 
configurations.

Modified:
  stable/11/sys/x86/x86/io_apic.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/x86/io_apic.c
==
--- stable/11/sys/x86/x86/io_apic.c Wed Apr  1 16:01:03 2020
(r359517)
+++ stable/11/sys/x86/x86/io_apic.c Wed Apr  1 16:02:42 2020
(r359518)
@@ -191,8 +191,11 @@ _ioapic_eoi_source(struct intsrc *isrc, int locked)
low1 |= IOART_TRGREDG | IOART_INTMSET;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
low1);
+   low1 = src->io_lowreg;
+   if (src->io_masked != 0)
+   low1 |= IOART_INTMSET;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
-   src->io_lowreg);
+   low1);
if (!locked)
mtx_unlock_spin(_lock);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359517 - stable/12/sys/x86/x86

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 16:01:03 2020
New Revision: 359517
URL: https://svnweb.freebsd.org/changeset/base/359517

Log:
  MFC r359093:
  Do not spuriously re-enable disabled io_apic pin on EOI for some 
configurations.

Modified:
  stable/12/sys/x86/x86/io_apic.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/x86/x86/io_apic.c
==
--- stable/12/sys/x86/x86/io_apic.c Wed Apr  1 15:59:26 2020
(r359516)
+++ stable/12/sys/x86/x86/io_apic.c Wed Apr  1 16:01:03 2020
(r359517)
@@ -194,8 +194,11 @@ _ioapic_eoi_source(struct intsrc *isrc, int locked)
low1 |= IOART_TRGREDG | IOART_INTMSET;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
low1);
+   low1 = src->io_lowreg;
+   if (src->io_masked != 0)
+   low1 |= IOART_INTMSET;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(src->io_intpin),
-   src->io_lowreg);
+   low1);
if (!locked)
mtx_unlock_spin(_lock);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359516 - stable/12/sys/x86/x86

2020-04-01 Thread Konstantin Belousov 
Author: kib
Date: Wed Apr  1 15:59:26 2020
New Revision: 359516
URL: https://svnweb.freebsd.org/changeset/base/359516

Log:
  MFC r359092:
  Stop (trying to) renumber io apics.

Modified:
  stable/12/sys/x86/x86/io_apic.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/x86/x86/io_apic.c
==
--- stable/12/sys/x86/x86/io_apic.c Wed Apr  1 15:57:14 2020
(r359515)
+++ stable/12/sys/x86/x86/io_apic.c Wed Apr  1 15:59:26 2020
(r359516)
@@ -95,7 +95,8 @@ struct ioapic_intsrc {
 struct ioapic {
struct pic io_pic;
u_int io_id:8;  /* logical ID */
-   u_int io_apic_id:8;
+   u_int io_apic_id:8; /* Id as enumerated by MADT */
+   u_int io_hw_apic_id:8;  /* Content of APIC ID register */
u_int io_intbase:8; /* System Interrupt base */
u_int io_numintr:8;
u_int io_haseoi:1;
@@ -635,15 +636,12 @@ ioapic_create(vm_paddr_t addr, int32_t apic_id, int in
io->pci_wnd = NULL;
mtx_lock_spin(_lock);
io->io_id = next_id++;
-   io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT;
-   if (apic_id != -1 && io->io_apic_id != apic_id) {
-   ioapic_write(apic, IOAPIC_ID, apic_id << APIC_ID_SHIFT);
-   mtx_unlock_spin(_lock);
-   io->io_apic_id = apic_id;
-   printf("ioapic%u: Changing APIC ID to %d\n", io->io_id,
-   apic_id);
-   } else
-   mtx_unlock_spin(_lock);
+   io->io_hw_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT;
+   io->io_apic_id = apic_id == -1 ? io->io_hw_apic_id : apic_id;
+   mtx_unlock_spin(_lock);
+   if (io->io_hw_apic_id != apic_id)
+   printf("ioapic%u: MADT APIC ID %d != hw id %d\n", io->io_id,
+   apic_id, io->io_hw_apic_id);
if (intbase == -1) {
intbase = next_ioapic_base;
printf("ioapic%u: Assuming intbase of %d\n", io->io_id,
@@ -1018,14 +1016,14 @@ ioapic_pci_attach(device_t dev)
}
/* Then by apic id */
STAILQ_FOREACH(io, _list, io_next) {
-   if (io->io_apic_id == apic_id)
+   if (io->io_hw_apic_id == apic_id)
goto found;
}
mtx_unlock_spin(_lock);
if (bootverbose)
device_printf(dev,
-   "cannot match pci bar apic id %d against MADT\n",
-   apic_id);
+   "cannot match pci bar apic id %d against MADT, BAR0 %#jx\n",
+   apic_id, (uintmax_t)rman_get_start(res));
 fail:
bus_release_resource(dev, SYS_RES_MEMORY, rid, res);
return (ENXIO);
@@ -1038,13 +1036,13 @@ found:
io->pci_dev = dev;
io->pci_wnd = res;
if (bootverbose && (io->io_paddr != (vm_paddr_t)rman_get_start(res) ||
-   io->io_apic_id != apic_id)) {
+   io->io_hw_apic_id != apic_id)) {
device_printf(dev, "pci%d:%d:%d:%d pci BAR0@%jx id %d "
-   "MADT id %d paddr@%jx\n",
+   "MADT id %d hw id %d paddr@%jx\n",
pci_get_domain(dev), pci_get_bus(dev),
pci_get_slot(dev), pci_get_function(dev),
(uintmax_t)rman_get_start(res), apic_id,
-   io->io_apic_id, (uintmax_t)io->io_paddr);
+   io->io_apic_id, io->io_hw_apic_id, (uintmax_t)io->io_paddr);
}
mtx_unlock_spin(_lock);
return (0);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359513 - head/share/man/man5

2020-04-01 Thread Ed Maste 
Author: emaste
Date: Wed Apr  1 15:34:10 2020
New Revision: 359513
URL: https://svnweb.freebsd.org/changeset/base/359513

Log:
  elf.5: add definitions of FreeBSD notes
  
  I hope to extend this with some more detail in the future but it gives
  a good starting point.
  
  Thanks to 0mp for assistance with markup.
  
  Reviewed by:  jkoshy
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D23982

Modified:
  head/share/man/man5/elf.5

Modified: head/share/man/man5/elf.5
==
--- head/share/man/man5/elf.5   Wed Apr  1 15:25:16 2020(r359512)
+++ head/share/man/man5/elf.5   Wed Apr  1 15:34:10 2020(r359513)
@@ -1296,6 +1296,32 @@ fields are padded to ensure 4-byte alignemnt.
 and
 .Va descsz
 specify the unpadded length.
+.Pp
+.Fx
+defines the following ELF note types
+.Po with corresponding interpretation of
+.Va desc Pc :
+.Bl -tag -width 4n
+.It Dv NT_FREEBSD_ABI_TAG Pq Value: 1
+Indicates the OS ABI version in a form of a 32-bit integer containing expected
+ABI version
+.Po i.e.,
+.Dv __FreeBSD_version Pc .
+.It Dv NT_FREEBSD_NOINIT_TAG Pq Value: 2
+Indicates that crt does not call init.
+.Va desc
+is ignored.
+.It Dv NT_FREEBSD_ARCH_TAG Pq Value: 3
+.It Dv NT_FREEBSD_FEATURE_CTL Pq Value: 4
+Contains a bitmask of mitigations and features to enable:
+.Bl -column "NT_FREEBSD_FCTL_PROTMAX_DISABLE" "0x00" "Disable implicit 
PROT_MAX"
+.Sy Name Ta Sy Value Ta Sy Description
+.It NT_FREEBSD_FCTL_ASLR_DISABLETa 0x01 Ta Disable ASLR
+.It NT_FREEBSD_FCTL_PROTMAX_DISABLE Ta 0x02 Ta Disable implicit PROT_MAX
+.It NT_FREEBSD_FCTL_STKGAP_DISABLE  Ta 0x04 Ta Disable stack gap
+.It NT_FREEBSD_FCTL_WXNEEDEDTa 0x08 Ta Binary makes W+X mappings
+.El
+.El
 .Sh SEE ALSO
 .Xr as 1 ,
 .Xr gdb 1 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359511 - head/bin/sh

2020-04-01 Thread Edward Tomasz Napierala 
Author: trasz
Date: Wed Apr  1 15:12:51 2020
New Revision: 359511
URL: https://svnweb.freebsd.org/changeset/base/359511

Log:
  Bump WARNS for sh(1).
  
  Reviewed by:  jilles
  MFC after:2 weeks
  Sponsored by: DARPA
  Differential Revision:https://reviews.freebsd.org/D24181

Modified:
  head/bin/sh/Makefile

Modified: head/bin/sh/Makefile
==
--- head/bin/sh/MakefileWed Apr  1 15:10:26 2020(r359510)
+++ head/bin/sh/MakefileWed Apr  1 15:12:51 2020(r359511)
@@ -30,8 +30,6 @@ LIBADD=   edit
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 # for debug:
 # DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline
-WARNS?=2
-WFORMAT=0
 
 .PATH: ${.CURDIR}/bltin \
${.CURDIR:H}/kill \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359499 - head/sys/dev/ahci

2020-04-01 Thread Alexander Motin 
Hi.

On 01.04.2020 00:28, Ravi Pokala wrote:
> -Original Message-
> From:  on behalf of Alexander Motin 
> 
> Date: 2020-03-31, Tuesday at 20:19
> To: , , 
> 
> Subject: svn commit: r359499 - head/sys/dev/ahci
> 
> Author: mav
> Date: Wed Apr  1 03:19:42 2020
> New Revision: 359499
> URL: https://svnweb.freebsd.org/changeset/base/359499
> 
> Log:
>   Add ID for JMicron JMB582/JMB585 AHCI controller.
>   
>   JMB582 has 2 6Gbps SATA ports and PCIe 3.0 x1.
>   JMB585 has 5 6Gbps SATA ports and PCIe 3.0 x2.
>   
>   Both chips support AHCI v1.31, Port Multiplier with FBS and 8 MSI 
> vectors.
> 
> Hi Alexander,
> 
> The second line of diff seems unrelated...?

It is related, because the check for shared PCI function for SATA and
PATA is no longer applicable to the new generation of HBAs, implementing
only AHCI.  And without adding more strict check the driver does not
attach when it should.

> 
>   MFC after:  2 weeks
> 
> Modified:
>   head/sys/dev/ahci/ahci_pci.c
> 
> Modified: head/sys/dev/ahci/ahci_pci.c
> 
> ==
> --- head/sys/dev/ahci/ahci_pci.c  Wed Apr  1 02:13:01 2020
> (r359498)
> +++ head/sys/dev/ahci/ahci_pci.c  Wed Apr  1 03:19:42 2020
> (r359499)
> @@ -247,6 +247,7 @@ static const struct {
>   {0x2365197b, 0x00, "JMicron JMB365",AHCI_Q_NOFORCE},
>   {0x2366197b, 0x00, "JMicron JMB366",AHCI_Q_NOFORCE},
>   {0x2368197b, 0x00, "JMicron JMB368",AHCI_Q_NOFORCE},
> + {0x0585197b, 0x00, "JMicron JMB58x",0},
>   {0x61ab, 0x00, "Marvell 88SE6111",  AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
>   AHCI_Q_1CH | AHCI_Q_EDGEIS},
>   {0x612111ab, 0x00, "Marvell 88SE6121",  AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
> @@ -399,6 +400,7 @@ ahci_probe(device_t dev)
>!(ahci_ids[i].quirks & AHCI_Q_NOFORCE {
>   /* Do not attach JMicrons with single PCI function. */
>   if (pci_get_vendor(dev) == 0x197b &&
> + (ahci_ids[i].quirks & AHCI_Q_NOFORCE) &&
>   (pci_read_config(dev, 0xdf, 1) & 0x40) == 0)
>   return (ENXIO);
>   snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
> 
> 
> 

-- 
Alexander Motin
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359504 - head/lib/libc/locale

2020-04-01 Thread Mateusz Piotrowski 
Author: 0mp (doc,ports committer)
Date: Wed Apr  1 09:01:35 2020
New Revision: 359504
URL: https://svnweb.freebsd.org/changeset/base/359504

Log:
  Use proper mdoc(7) macros for literal text and do not use Tn
  
  Tn is deprecated and upsets linters.
  
  MFC after:3 days

Modified:
  head/lib/libc/locale/big5.5

Modified: head/lib/libc/locale/big5.5
==
--- head/lib/libc/locale/big5.5 Wed Apr  1 07:28:31 2020(r359503)
+++ head/lib/libc/locale/big5.5 Wed Apr  1 09:01:35 2020(r359504)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 12, 2019
+.Dd April 1, 2020
 .Dt BIG5 5
 .Os
 .Sh NAME
@@ -39,9 +39,8 @@ encoding for Traditional Chinese text
 .Dq Big Five
 is a standard for encoding Traditional Chinese text.
 Each character is represented by either one or two bytes.
-Characters from the
-.Tn ASCII
-character set are represented as single bytes in the range 0x00 - 0x7F.
+Characters from the ASCII character set are represented as
+single bytes in the range 0x00 - 0x7F.
 Traditional Chinese characters are represented by two bytes:
 the first in the range 0xA1 - 0xFE, the second in the range
 0x40 - 0xFE.
@@ -51,7 +50,11 @@ the first in the range 0xA1 - 0xFE, the second in the 
 .Xr utf8 5
 .Sh BUGS
 The range of the second byte overlaps some ASCII characters, including
-0x5C (`\\') and 0x7C (`|') which may cause problems in program execution or
+0x5C
+.Pq Ql \e
+and 0x7C
+.Pq Ql |
+which may cause problems in program execution or
 display.
 Big5 is considered a legacy standard and only preserved for backward
 compatibility reason.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359503 - in head

2020-04-01 Thread Cy Schubert 
On April 1, 2020 5:06:06 AM PDT, Cy Schubert  wrote:
>On March 31, 2020 10:53:14 PM PDT, Glen Barber  wrote:
>>Author: gjb
>>Date: Wed Apr  1 05:51:46 UTC 2020
>>New Revision: 359503
>>URL: https://svnweb.freebsd.org/changeset/base/359503
>>
>>Log:
>>  Update head to 14.0-CURRENT in order to prevent having
>>  a 13.0-RELEASE.
>>
>>Modified:
>>  Makefile.inc1
>>  UPDATING
>>  lib/clang/freebsd_cc_version.h
>>  lib/clang/llvm.build.mk
>>  sys/conf/newvers.sh
>>  sys/sys/param.h
>>
>>Index: Makefile.inc1
>>===
>>--- Makefile.inc1 (revision 359501)
>>+++ Makefile.inc1 (working copy)
>>@@ -130,9 +130,9 @@ TARGET_ABI=   gnueabi
>> .endif
>> .endif
>> MACHINE_ABI?=unknown
>>-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
>>+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
>> TARGET_ABI?= unknown
>>-TARGET_TRIPLE?=  
>>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
>>+TARGET_TRIPLE?=  
>>${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
>> KNOWN_ARCHES?=   aarch64/arm64 \
>>  amd64 \
>>  armv6/arm \
>>@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
>> .endif
>> 
>># flua is required to regenerate syscall files.  It first appeared
>>during the
>>-# 13.0-CURRENT cycle, thus needs to be built on -older releases and
>>stable
>>+# 14.0-CURRENT cycle, thus needs to be built on -older releases and
>>stable
>> # branches.
>> .if ${BOOTSTRAPPING} < 1300059
>> ${_bt}-libexec/flua: ${_bt}-lib/liblua
>>Index: UPDATING
>>===
>>--- UPDATING  (revision 359501)
>>+++ UPDATING  (working copy)
>>@@ -11,8 +11,8 @@ handbook:
>> Items affecting the ports and packages system can be found in
>>/usr/ports/UPDATING.  Please read that file before running
>portupgrade.
>> 
>>-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
>>- FreeBSD 13.x has many debugging features turned on, in both the
>>kernel
>>+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
>>+ FreeBSD 14.x has many debugging features turned on, in both the
>>kernel
>>  and userland.  These features attempt to detect incorrect use of
>>  system primitives, and encourage loud failure through extra sanity
>>  checking and fail stop semantics.  They also substantially impact
>>Index: lib/clang/freebsd_cc_version.h
>>===
>>--- lib/clang/freebsd_cc_version.h(revision 359501)
>>+++ lib/clang/freebsd_cc_version.h(working copy)
>>@@ -1,3 +1,3 @@
>> /* $FreeBSD$ */
>> 
>>-#define  FREEBSD_CC_VERSION  137
>>+#define  FREEBSD_CC_VERSION  147
>>Index: lib/clang/llvm.build.mk
>>===
>>--- lib/clang/llvm.build.mk   (revision 359501)
>>+++ lib/clang/llvm.build.mk   (working copy)
>>@@ -38,7 +38,7 @@ TARGET_ABI= -gnueabi
>> TARGET_ABI=
>> .endif
>> VENDOR=  unknown
>>-OS_VERSION=  freebsd13.0
>>+OS_VERSION=  freebsd14.0
>> 
>>LLVM_TARGET_TRIPLE?=  
>>${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
>>LLVM_BUILD_TRIPLE?=   
>>${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
>>Index: sys/conf/newvers.sh
>>===
>>--- sys/conf/newvers.sh   (revision 359501)
>>+++ sys/conf/newvers.sh   (working copy)
>>@@ -53,7 +53,7 @@
>> #
>> 
>> TYPE="FreeBSD"
>>-REVISION="13.0"
>>+REVISION="14.0"
>> BRANCH=${BRANCH_OVERRIDE:-CURRENT}
>> RELEASE="${REVISION}-${BRANCH}"
>> VERSION="${TYPE} ${RELEASE}"
>>Index: sys/sys/param.h
>>===
>>--- sys/sys/param.h   (revision 359501)
>>+++ sys/sys/param.h   (working copy)
>>@@ -60,7 +60,7 @@
>>  *   in the range 5 to 9.
>>  */
>> #undef __FreeBSD_version
>>-#define __FreeBSD_version 1300087/* Master, propagated to newvers */
>>+#define __FreeBSD_version 1400087/* Master, propagated to newvers */
>> 
>> /*
>>* __FreeBSD_kernel__ indicates that this system uses the kernel of
>>FreeBSD,
>
>This was discussed at length just before 12 was released. Are you now
>the one to decide naming, disregarding the discussion?
>
>Should we not have also skipped 4?

Ok. I've been had. Woke up at 4 am and half asleep and exceptionally grumpy, as 
I have been first thing in the morning the last few months. I didn't clue into 
which day it was. Yet. I'm awake now ready to tackle today's insanity. 



-- 
Pardon the typos and autocorrect, small keyboard in use. 
Cy Schubert 
FreeBSD UNIX:  Web: https://www.FreeBSD.org

The need of the many outweighs the greed of the few.

Sent from my

svn commit: r359503 - stable/12/usr.bin/posixshmcontrol

2020-04-01 Thread Mateusz Piotrowski 
Author: 0mp (doc,ports committer)
Date: Wed Apr  1 07:28:31 2020
New Revision: 359503
URL: https://svnweb.freebsd.org/changeset/base/359503

Log:
  MFC 359071:
  
  Document that posixshmcontrol first appeared in 12.1
  
  Also while here, I am addressing some linting issues.
  
  PR:   243132
  Submitted by: Noah Altunian 
  Approved by:  bcr (mentor)
  Differential Revision:https://reviews.freebsd.org/D24112

Modified:
  stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1
==
--- stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1 Wed Apr  1 05:45:12 
2020(r359502)
+++ stable/12/usr.bin/posixshmcontrol/posixshmcontrol.1 Wed Apr  1 07:28:31 
2020(r359503)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 30, 2019
+.Dd March 18, 2020
 .Dt POSIXSHMCONTROL 1
 .Os
 .Sh NAME
@@ -99,7 +99,7 @@ Argument to the
 .Fl s
 option specifies new length.
 The human-friendly 'k', 'm', 'g' suffixes can be used, see
-.Xr expand_number 3.
+.Xr expand_number 3 .
 If the option is not specified, assumed length is zero.
 .El
 .Pp
@@ -143,10 +143,12 @@ and then enlarge it to 1M, use the sequence of command
 The
 .Nm
 command appeared in
-.Fx 13.0 .
+.Fx 12.1 .
 .Sh AUTHORS
 The
 .Nm
 command and this manual page were written by
 .An Konstantin Belousov Aq Mt k...@freebsd.org
-under sponsorship from The FreeBSD Foundation.
+under sponsorship from The
+.Fx
+Foundation.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359503 - in head

2020-04-01 Thread Li-Wen Hsu 
On Wed, Apr 1, 2020 at 1:53 PM Glen Barber  wrote:
>
> Author: gjb
> Date: Wed Apr  1 05:51:46 UTC 2020
> New Revision: 359503
> URL: https://svnweb.freebsd.org/changeset/base/359503
>
> Log:
>   Update head to 14.0-CURRENT in order to prevent having
>   a 13.0-RELEASE.
...
> Index: sys/sys/param.h
> ===
> --- sys/sys/param.h (revision 359501)
> +++ sys/sys/param.h (working copy)
> @@ -60,7 +60,7 @@
>   * in the range 5 to 9.
>   */
>  #undef __FreeBSD_version
> -#define __FreeBSD_version 1300087  /* Master, propagated to newvers */
> +#define __FreeBSD_version 1400087  /* Master, propagated to newvers */

I think we want 140 here :-)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359505 - head/usr.sbin/jail

2020-04-01 Thread Andrew Turner 
Author: andrew
Date: Wed Apr  1 09:51:29 2020
New Revision: 359505
URL: https://svnweb.freebsd.org/changeset/base/359505

Log:
  Use memmove to copy within a buffer
  
  jail(8) would try to use strcpy to remove the interface from the start of
  an IP address. This is undefined, and on arm64 will result in unexpected
  IPv6 addresses.
  
  Fix this by using memmove top move the string.
  
  PR:   245102
  Reported by:  sbruno
  MFC after:2 weeks
  Sponsored by: Innovate UK

Modified:
  head/usr.sbin/jail/config.c

Modified: head/usr.sbin/jail/config.c
==
--- head/usr.sbin/jail/config.c Wed Apr  1 09:01:35 2020(r359504)
+++ head/usr.sbin/jail/config.c Wed Apr  1 09:51:29 2020(r359505)
@@ -596,8 +596,8 @@ check_intparams(struct cfjail *j)
if (cs || defif)
add_param(j, NULL, IP__IP4_IFADDR, s->s);
if (cs) {
-   strcpy(s->s, cs + 1);
s->len -= cs + 1 - s->s;
+   memmove(s->s, cs + 1, s->len + 1);
}
if ((cs = strchr(s->s, '/')) != NULL) {
*cs = '\0';
@@ -617,8 +617,8 @@ check_intparams(struct cfjail *j)
if (cs || defif)
add_param(j, NULL, IP__IP6_IFADDR, s->s);
if (cs) {
-   strcpy(s->s, cs + 1);
s->len -= cs + 1 - s->s;
+   memmove(s->s, cs + 1, s->len + 1);
}
if ((cs = strchr(s->s, '/')) != NULL) {
*cs = '\0';
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r359503 - in head

2020-04-01 Thread Glen Barber 
On Wed, Apr 01, 2020 at 02:11:02PM +0800, Li-Wen Hsu wrote:
> On Wed, Apr 1, 2020 at 1:53 PM Glen Barber  wrote:
> >
> > Author: gjb
> > Date: Wed Apr  1 05:51:46 UTC 2020
> > New Revision: 359503
> > URL: https://svnweb.freebsd.org/changeset/base/359503
> >
> > Log:
> >   Update head to 14.0-CURRENT in order to prevent having
> >   a 13.0-RELEASE.
> ...
> > Index: sys/sys/param.h
> > ===
> > --- sys/sys/param.h (revision 359501)
> > +++ sys/sys/param.h (working copy)
> > @@ -60,7 +60,7 @@
> >   * in the range 5 to 9.
> >   */
> >  #undef __FreeBSD_version
> > -#define __FreeBSD_version 1300087  /* Master, propagated to newvers */
> > +#define __FreeBSD_version 1400087  /* Master, propagated to newvers */
> 
> I think we want 140 here :-)
> 

You are correct.  I will fix it after dealing with the influx of
complaints about this commit.

Glen



signature.asc
Description: PGP signature

svn commit: r359502 - in head: lib/libveriexec share/mk

2020-04-01 Thread Simon J. Gerraty 
Author: sjg
Date: Wed Apr  1 05:45:12 2020
New Revision: 359502
URL: https://svnweb.freebsd.org/changeset/base/359502

Log:
  Do not claim libbearssl et al are INTERNALLIB
  
  If INTERNALLIB is defined we need PIE and bsd.incs.mk is
  not included.
  
  PR:   245189
  Reviewed by:  emaste
  MFC after:1 week
  Differential Revision: https://reviews.freebsd.org//D24233

Modified:
  head/lib/libveriexec/Makefile
  head/share/mk/src.libnames.mk

Modified: head/lib/libveriexec/Makefile
==
--- head/lib/libveriexec/Makefile   Wed Apr  1 04:51:39 2020
(r359501)
+++ head/lib/libveriexec/Makefile   Wed Apr  1 05:45:12 2020
(r359502)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include 
+.include 
 
 LIB=   veriexec
 MAN=   veriexec.3

Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk   Wed Apr  1 04:51:39 2020
(r359501)
+++ head/share/mk/src.libnames.mk   Wed Apr  1 05:45:12 2020
(r359502)
@@ -222,18 +222,18 @@ _LIBRARIES+= \
 .endif
 
 .if ${MK_BEARSSL} == "yes"
-_INTERNALLIBS+= \
+_LIBRARIES+= \
bearssl \
secureboot \
 
-LIBBEARSSL?=   ${LIBBEARSSLDIR}/libbearssl${PIE_SUFFIX}.a
-LIBSECUREBOOT?=${LIBSECUREBOOTDIR}/libsecureboot${PIE_SUFFIX}.a
+LIBBEARSSL?=   ${LIBBEARSSLDIR}/libbearssl.a
+LIBSECUREBOOT?=${LIBSECUREBOOTDIR}/libsecureboot.a
 .endif
 
 .if ${MK_VERIEXEC} == "yes"
-_INTERNALLIBS+= veriexec
+_LIBRARIES+= veriexec
 
-LIBVERIEXEC?=  ${LIBVERIEXECDIR}/libveriexec${PIE_SUFFIX}.a
+LIBVERIEXEC?=  ${LIBVERIEXECDIR}/libveriexec.a
 .endif
 
 # Each library's LIBADD needs to be duplicated here for static linkage of
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r359503 - in head

2020-04-01 Thread Glen Barber 
Author: gjb
Date: Wed Apr  1 05:51:46 UTC 2020
New Revision: 359503
URL: https://svnweb.freebsd.org/changeset/base/359503

Log:
  Update head to 14.0-CURRENT in order to prevent having
  a 13.0-RELEASE.

Modified:
  Makefile.inc1
  UPDATING
  lib/clang/freebsd_cc_version.h
  lib/clang/llvm.build.mk
  sys/conf/newvers.sh
  sys/sys/param.h

Index: Makefile.inc1
===
--- Makefile.inc1   (revision 359501)
+++ Makefile.inc1   (working copy)
@@ -130,9 +130,9 @@ TARGET_ABI= gnueabi
 .endif
 .endif
 MACHINE_ABI?=  unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd14.0
 TARGET_ABI?=   unknown
-TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
+TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd14.0
 KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
armv6/arm \
@@ -2123,7 +2123,7 @@ ${_bt}-lib/libdwarf: ${_bt_m4_depend}
 .endif
 
 # flua is required to regenerate syscall files.  It first appeared during the
-# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable
+# 14.0-CURRENT cycle, thus needs to be built on -older releases and stable
 # branches.
 .if ${BOOTSTRAPPING} < 1300059
 ${_bt}-libexec/flua: ${_bt}-lib/liblua
Index: UPDATING
===
--- UPDATING(revision 359501)
+++ UPDATING(working copy)
@@ -11,8 +11,8 @@ handbook:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
-   FreeBSD 13.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
+   FreeBSD 14.x has many debugging features turned on, in both the kernel
and userland.  These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics.  They also substantially impact
Index: lib/clang/freebsd_cc_version.h
===
--- lib/clang/freebsd_cc_version.h  (revision 359501)
+++ lib/clang/freebsd_cc_version.h  (working copy)
@@ -1,3 +1,3 @@
 /* $FreeBSD$ */
 
-#defineFREEBSD_CC_VERSION  137
+#defineFREEBSD_CC_VERSION  147
Index: lib/clang/llvm.build.mk
===
--- lib/clang/llvm.build.mk (revision 359501)
+++ lib/clang/llvm.build.mk (working copy)
@@ -38,7 +38,7 @@ TARGET_ABI=   -gnueabi
 TARGET_ABI=
 .endif
 VENDOR=unknown
-OS_VERSION=freebsd13.0
+OS_VERSION=freebsd14.0
 
 LLVM_TARGET_TRIPLE?=   
${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
 LLVM_BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
Index: sys/conf/newvers.sh
===
--- sys/conf/newvers.sh (revision 359501)
+++ sys/conf/newvers.sh (working copy)
@@ -53,7 +53,7 @@
 #
 
 TYPE="FreeBSD"
-REVISION="13.0"
+REVISION="14.0"
 BRANCH=${BRANCH_OVERRIDE:-CURRENT}
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
Index: sys/sys/param.h
===
--- sys/sys/param.h (revision 359501)
+++ sys/sys/param.h (working copy)
@@ -60,7 +60,7 @@
  * in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1300087  /* Master, propagated to newvers */
+#define __FreeBSD_version 1400087  /* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"