svn commit: r336662 - in head: share/man/man4 sys/dev/jedec_ts

2018-07-24 Thread Ravi Pokala
Author: rpokala
Date: Tue Jul 24 08:15:02 2018
New Revision: 336662
URL: https://svnweb.freebsd.org/changeset/base/336662

Log:
  Deprecate jedec_ts(4) and point users to jedec_dimm(4) instead
  
  jedec_dimm(4) is a superset of the functionality of jedec_ts(4). Mark
  jedec_ts(4) as removed in FreeBSD 12, and include a pointer to the migration
  instructions in the jedec_dimm(4) manpage, in both the jedec_ts(4) code and
  the jedec_ts(4) manpage. Add a note to the jedec_dimm(4) manpage about the
  fact that it is a superset of jedec_ts(4).
  
  This change will be MFCed to stable/11 and stable/10; the followup change
  to actually remove jedec_ts(4) from -HEAD will not.
  
  Reviewed by:  avg
  MFC after:1 week
  Relnotes: yes
  Differential Revision:https://reviews.freebsd.org/D16412

Modified:
  head/share/man/man4/jedec_dimm.4
  head/share/man/man4/jedec_ts.4
  head/sys/dev/jedec_ts/jedec_ts.c

Modified: head/share/man/man4/jedec_dimm.4
==
--- head/share/man/man4/jedec_dimm.4Tue Jul 24 05:09:50 2018
(r336661)
+++ head/share/man/man4/jedec_dimm.4Tue Jul 24 08:15:02 2018
(r336662)
@@ -163,6 +163,9 @@ dev.jedec_dimm.6.temp: 43.1C
 dev.jedec_dimm.6.type: DDR4
 .Ed
 .Sh COMPATIBILITY
+.Nm
+implements a superset of the functionality of
+.Xr jedec_ts 4 .
 Hints for
 .Xr jedec_ts 4
 can be mechanically converted for use with

Modified: head/share/man/man4/jedec_ts.4
==
--- head/share/man/man4/jedec_ts.4  Tue Jul 24 05:09:50 2018
(r336661)
+++ head/share/man/man4/jedec_ts.4  Tue Jul 24 08:15:02 2018
(r336662)
@@ -63,6 +63,18 @@ In
 .Cd hint.jedec_ts.7.at="smbus0"
 .Cd hint.jedec_ts.7.addr="0x3E"
 .Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver is not present in
+.Fx 12.0
+and later.
+A superset of its functionality is available in the
+.Xr jedec_dimm 4
+driver.
+That driver's manpage includes instructions on updating
+.Pa /boot/device.hints
+accordingly.
 .Sh DESCRIPTION
 The
 .Nm

Modified: head/sys/dev/jedec_ts/jedec_ts.c
==
--- head/sys/dev/jedec_ts/jedec_ts.cTue Jul 24 05:09:50 2018
(r336661)
+++ head/sys/dev/jedec_ts/jedec_ts.cTue Jul 24 08:15:02 2018
(r336662)
@@ -247,6 +247,9 @@ ts_attach(device_t dev)
CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0,
ts_temp_sysctl, "IK4", "Current temperature");
 
+   gone_in_dev(dev, 12,
+   "jedec_ts(4) driver; see COMPATIBILITY section of jedec_dimm(4)");
+
return (0);
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336663 - head/lib/msun/src

2018-07-24 Thread Bruce Evans
Author: bde
Date: Tue Jul 24 10:10:16 2018
New Revision: 336663
URL: https://svnweb.freebsd.org/changeset/base/336663

Log:
  Fix the conversion to use nan_mix() in r336362.  fmod*(x, y),
  remainder*(x, y) and remquo*(x, y, quo) were broken for y = 0 by changing
  multiplication by y to addition of y.  (When y is 0, the result should be
  NaN but became 1 for finite x.)
  
  Use a new macro nan_mix_op() to give more control over the mixing, and
  expand comments.
  
  Recent re-testing missed finding this bug since I only tested the macro
  version on amd64 and i386 and these arches don't use the C versions (they
  use either asm versions or builtins).
  
  Reported by:  enh via freebsd-numerics

Modified:
  head/lib/msun/src/e_fmod.c
  head/lib/msun/src/e_fmodf.c
  head/lib/msun/src/e_fmodl.c
  head/lib/msun/src/e_remainder.c
  head/lib/msun/src/e_remainderf.c
  head/lib/msun/src/math_private.h
  head/lib/msun/src/s_remquo.c
  head/lib/msun/src/s_remquof.c
  head/lib/msun/src/s_remquol.c

Modified: head/lib/msun/src/e_fmod.c
==
--- head/lib/msun/src/e_fmod.c  Tue Jul 24 08:15:02 2018(r336662)
+++ head/lib/msun/src/e_fmod.c  Tue Jul 24 10:10:16 2018(r336663)
@@ -42,7 +42,7 @@ __ieee754_fmod(double x, double y)
 /* purge off exception values */
if((hy|ly)==0||(hx>=0x7ff0)||   /* y=0,or x not finite */
  ((hy|((ly|-ly)>>31))>0x7ff0)) /* or y is NaN */
-   return nan_mix(x, y)/nan_mix(x, y);
+   return nan_mix_op(x, y, *)/nan_mix_op(x, y, *);
if(hx<=hy) {
if((hx=0x7f80)||/* y=0,or x not finite */
   (hy>0x7f80)) /* or y is NaN */
-   return nan_mix(x, y)/nan_mix(x, y);
+   return nan_mix_op(x, y, *)/nan_mix_op(x, y, *);
if(hx>31]; /* |x|=|y| return x*0*/

Modified: head/lib/msun/src/e_fmodl.c
==
--- head/lib/msun/src/e_fmodl.c Tue Jul 24 08:15:02 2018(r336662)
+++ head/lib/msun/src/e_fmodl.c Tue Jul 24 10:10:16 2018(r336663)
@@ -79,7 +79,7 @@ fmodl(long double x, long double y)
   (ux.bits.exp == BIAS + LDBL_MAX_EXP) ||   /* or x not finite */
   (uy.bits.exp == BIAS + LDBL_MAX_EXP &&
((uy.bits.manh&~LDBL_NBIT)|uy.bits.manl)!=0)) /* or y is NaN */
-   return nan_mix(x, y)/nan_mix(x, y);
+   return nan_mix_op(x, y, *)/nan_mix_op(x, y, *);
if(ux.bits.exp<=uy.bits.exp) {
if((ux.bits.exp=0x7ff0)||/* x not finite */
  ((hp>=0x7ff0)&&   /* p is NaN */
  (((hp-0x7ff0)|lp)!=0)))
-   return nan_mix(x, p)/nan_mix(x, p);
+   return nan_mix_op(x, p, *)/nan_mix_op(x, p, *);
 
 
if (hp<=0x7fdf) x = __ieee754_fmod(x,p+p);  /* now x < 2p */

Modified: head/lib/msun/src/e_remainderf.c
==
--- head/lib/msun/src/e_remainderf.cTue Jul 24 08:15:02 2018
(r336662)
+++ head/lib/msun/src/e_remainderf.cTue Jul 24 10:10:16 2018
(r336663)
@@ -39,7 +39,7 @@ __ieee754_remainderf(float x, float p)
if((hp==0)||/* p = 0 */
  (hx>=0x7f80)||/* x not finite */
  ((hp>0x7f80)))/* p is NaN */
-   return nan_mix(x, p)/nan_mix(x, p);
+   return nan_mix_op(x, p, *)/nan_mix_op(x, p, *);
 
 
if (hp<=0x7eff) x = __ieee754_fmodf(x,p+p); /* now x < 2p */

Modified: head/lib/msun/src/math_private.h
==
--- head/lib/msun/src/math_private.hTue Jul 24 08:15:02 2018
(r336662)
+++ head/lib/msun/src/math_private.hTue Jul 24 10:10:16 2018
(r336663)
@@ -479,22 +479,29 @@ do {  
\
 void _scan_nan(uint32_t *__words, int __num_words, const char *__s);
 
 /*
- * Mix 1 or 2 NaNs.  First add 0 to each arg.  This normally just turns
+ * Mix 0, 1 or 2 NaNs.  First add 0 to each arg.  This normally just turns
  * signaling NaNs into quiet NaNs by setting a quiet bit.  We do this
  * because we want to never return a signaling NaN, and also because we
  * don't want the quiet bit to affect the result.  Then mix the converted
- * args using addition.  The result is typically the arg whose mantissa
- * bits (considered as in integer) are largest.
+ * args using the specified operation.
  *
- * Technical complications: the result in bits might depend on the precision
- * and/or on compiler optimizations, especially when different register sets
- * are used for different precisions.  Try to make the result not depend on
- * at least the precision by always doing the main mixing step in long double
+ * When one arg 

svn commit: r336664 - head/contrib/llvm/tools/lld/ELF

2018-07-24 Thread Ed Maste
Author: emaste
Date: Tue Jul 24 11:35:22 2018
New Revision: 336664
URL: https://svnweb.freebsd.org/changeset/base/336664

Log:
  lld: fix addends with partial linking
  
  [ELF] Update addends in non-allocatable sections for REL targets when
  creating a relocatable output.
  
  LLVM PR: 37735
  LLVM Differential Revision: https://reviews.llvm.org/D48929
  
  PR:   225128
  Obtained from:LLVM r336799 by Igor Kudrin

Modified:
  head/contrib/llvm/tools/lld/ELF/InputSection.cpp

Modified: head/contrib/llvm/tools/lld/ELF/InputSection.cpp
==
--- head/contrib/llvm/tools/lld/ELF/InputSection.cppTue Jul 24 10:10:16 
2018(r336663)
+++ head/contrib/llvm/tools/lld/ELF/InputSection.cppTue Jul 24 11:35:22 
2018(r336664)
@@ -686,6 +686,23 @@ void InputSection::relocateNonAlloc(uint8_t *Buf, Arra
   }
 }
 
+// This is used when '-r' is given.
+// For REL targets, InputSection::copyRelocations() may store artificial
+// relocations aimed to update addends. They are handled in relocateAlloc()
+// for allocatable sections, and this function does the same for
+// non-allocatable sections, such as sections with debug information.
+static void relocateNonAllocForRelocatable(InputSection *Sec, uint8_t *Buf) {
+  const unsigned Bits = Config->Is64 ? 64 : 32;
+
+  for (const Relocation &Rel : Sec->Relocations) {
+// InputSection::copyRelocations() adds only R_ABS relocations.
+assert(Rel.Expr == R_ABS);
+uint8_t *BufLoc = Buf + Rel.Offset + Sec->OutSecOff;
+uint64_t TargetVA = SignExtend64(Rel.Sym->getVA(Rel.Addend), Bits);
+Target->relocateOne(BufLoc, Rel.Type, TargetVA);
+  }
+}
+
 template 
 void InputSectionBase::relocate(uint8_t *Buf, uint8_t *BufEnd) {
   if (Flags & SHF_ALLOC) {
@@ -694,7 +711,9 @@ void InputSectionBase::relocate(uint8_t *Buf, uint8_t 
   }
 
   auto *Sec = cast(this);
-  if (Sec->AreRelocsRela)
+  if (Config->Relocatable)
+relocateNonAllocForRelocatable(Sec, Buf);
+  else if (Sec->AreRelocsRela)
 Sec->relocateNonAlloc(Buf, Sec->template relas());
   else
 Sec->relocateNonAlloc(Buf, Sec->template rels());
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336665 - head/lib/msun/src

2018-07-24 Thread Bruce Evans
Author: bde
Date: Tue Jul 24 11:50:05 2018
New Revision: 336665
URL: https://svnweb.freebsd.org/changeset/base/336665

Log:
  In C remquol() and thus also in C remainderl(), don't clobber the sign bit
  of NaNs before possible returning a NaN.
  
  The remquo*() and remainder*() functions should now give bitwise identical
  results across arches and implementations, and bitwise consistent results
  (with lower precisions having truncated mantissas) across precisions.  x86
  already had consistency across amd64 and i386 and precisions by using the
  i387 consistently and normally not using the C versions.  Inconsistencies
  for C reqmquol() were first detected on sparc64.
  
  Remove double second clearing of the sign bit and extra blank lines.

Modified:
  head/lib/msun/src/s_remquol.c

Modified: head/lib/msun/src/s_remquol.c
==
--- head/lib/msun/src/s_remquol.c   Tue Jul 24 11:35:22 2018
(r336664)
+++ head/lib/msun/src/s_remquol.c   Tue Jul 24 11:50:05 2018
(r336665)
@@ -79,7 +79,6 @@ remquol(long double x, long double y, int *quo)
sxy = sx ^ uy.bits.sign;
ux.bits.sign = 0;   /* |x| */
uy.bits.sign = 0;   /* |y| */
-   x = ux.e;
 
 /* purge off exception values */
if((uy.bits.exp|uy.bits.manh|uy.bits.manl)==0 || /* y=0 */
@@ -126,7 +125,6 @@ remquol(long double x, long double y, int *quo)
 /* fix point fmod */
n = ix - iy;
q = 0;
-
while(n--) {
hz=hx-hy;lz=lx-ly; if(lx>MANL_SHIFT); lx = lx+lx;}
@@ -154,9 +152,8 @@ remquol(long double x, long double y, int *quo)
} else {
ux.bits.exp = iy + BIAS;
}
-   ux.bits.sign = 0;
-   x = ux.e;
 fixup:
+   x = ux.e;   /* |x| */
y = fabsl(y);
if (y < LDBL_MIN * 2) {
if (x+x>y || (x+x==y && (q & 1))) {
@@ -167,11 +164,9 @@ fixup:
q++;
x-=y;
}
-
ux.e = x;
ux.bits.sign ^= sx;
x = ux.e;
-
q &= 0x7fff;
*quo = (sxy ? -q : q);
return x;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336672 - in head/sys: modules/tcp modules/tcp/fastpath netinet/tcp_stacks

2018-07-24 Thread Randall Stewart
Author: rrs
Date: Tue Jul 24 14:55:47 2018
New Revision: 336672
URL: https://svnweb.freebsd.org/changeset/base/336672

Log:
  Delete the example tcp stack "fastpath" which
  was only put in has an example.
  
  Sponsored by: Netflix inc.
  Differential Revision:https://reviews.freebsd.org/D16420

Deleted:
  head/sys/modules/tcp/fastpath/
  head/sys/netinet/tcp_stacks/fastpath.c
Modified:
  head/sys/modules/tcp/Makefile

Modified: head/sys/modules/tcp/Makefile
==
--- head/sys/modules/tcp/Makefile   Tue Jul 24 13:31:50 2018
(r336671)
+++ head/sys/modules/tcp/Makefile   Tue Jul 24 14:55:47 2018
(r336672)
@@ -6,12 +6,10 @@ SYSDIR?=${SRCTOP}/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=\
-   ${_tcp_fastpath} \
 ${_tcp_rack} \
${_tcpmd5} \
 
 .if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES)
-_tcp_fastpath= fastpath
 _tcp_rack= rack
 .endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336674 - in head: share/man/man9 sys/net

2018-07-24 Thread Andrew Turner
Author: andrew
Date: Tue Jul 24 16:31:16 2018
New Revision: 336674
URL: https://svnweb.freebsd.org/changeset/base/336674

Log:
  As with DPCPU create VNET_DEFINE_STATIC for when a variable needs to be
  declaired static. This will allow us to change the definition on arm64
  as it has the same issues described in r336349.
  
  Reviewed by:  bz
  Sponsored by: DARPA, AFRL
  Differential Revision:https://reviews.freebsd.org/D16147

Modified:
  head/share/man/man9/vnet.9
  head/sys/net/vnet.h

Modified: head/share/man/man9/vnet.9
==
--- head/share/man/man9/vnet.9  Tue Jul 24 15:42:23 2018(r336673)
+++ head/share/man/man9/vnet.9  Tue Jul 24 16:31:16 2018(r336674)
@@ -66,6 +66,10 @@
 .Fa "type" "name"
 .Fc
 .\"
+.Fo VNET_DEFINE_STATIC
+.Fa "type" "name"
+.Fc
+.\"
 .Bd -literal
 #defineV_name  VNET(name)
 .Ed
@@ -208,11 +212,15 @@ Variables are virtualized by using the
 .Fn VNET_DEFINE
 macro rather than writing them out as
 .Em type name .
-One can still use static initialization or storage class specifiers, e.g.,
+One can still use static initialization, e.g.,
 .Pp
-.Dl Li static VNET_DEFINE(int, foo) = 1;
-or
-.Dl Li static VNET_DEFINE(SLIST_HEAD(, bar), bars);
+.Dl Li VNET_DEFINE(int, foo) = 1;
+.Pp
+Variables declared with the static keyword can use the
+.Fn VNET_DEFINE_STATIC
+macro, e.g.,
+.Pp
+.Dl Li VNET_DEFINE_STATIC(SLIST_HEAD(, bar), bars);
 .Pp
 Static initialization is not possible when the virtualized variable
 would need to be referenced, e.g., with

Modified: head/sys/net/vnet.h
==
--- head/sys/net/vnet.h Tue Jul 24 15:42:23 2018(r336673)
+++ head/sys/net/vnet.h Tue Jul 24 16:31:16 2018(r336674)
@@ -93,6 +93,8 @@ struct vnet {
 
 #defineVNET_PCPUSTAT_DEFINE(type, name)\
 VNET_DEFINE(counter_u64_t, name[sizeof(type) / sizeof(uint64_t)])
+#defineVNET_PCPUSTAT_DEFINE_STATIC(type, name) \
+VNET_DEFINE_STATIC(counter_u64_t, name[sizeof(type) / sizeof(uint64_t)])
 
 #defineVNET_PCPUSTAT_ALLOC(name, wait) \
 COUNTER_ARRAY_ALLOC(VNET(name), \
@@ -268,7 +270,10 @@ extern struct sx vnet_sxlock;
  */
 #defineVNET_NAME(n)vnet_entry_##n
 #defineVNET_DECLARE(t, n)  extern t VNET_NAME(n)
-#defineVNET_DEFINE(t, n)   t VNET_NAME(n) __section(VNET_SETNAME) 
__used
+#defineVNET_DEFINE(t, n)   \
+t VNET_NAME(n) __section(VNET_SETNAME) __used
+#defineVNET_DEFINE_STATIC(t, n) \
+static t VNET_NAME(n) __section(VNET_SETNAME) __used
 #define_VNET_PTR(b, n) (__typeof(VNET_NAME(n))*)   
\
((b) + (uintptr_t)&VNET_NAME(n))
 
@@ -400,7 +405,8 @@ do {
\
  */
 #defineVNET_NAME(n)n
 #defineVNET_DECLARE(t, n)  extern t n
-#defineVNET_DEFINE(t, n)   t n
+#defineVNET_DEFINE(t, n)   struct _hack; t n
+#defineVNET_DEFINE_STATIC(t, n)static t n
 #define_VNET_PTR(b, n) &VNET_NAME(n)
 
 /*
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336675 - head/share/mk

2018-07-24 Thread Brad Davis
Author: brd
Date: Tue Jul 24 16:34:58 2018
New Revision: 336675
URL: https://svnweb.freebsd.org/changeset/base/336675

Log:
  Convert bsd.confs.mk to support DIRS.
  
  This paves the way for moving config files out of head/etc and into the
  directories with the src.
  
  Approved by:  bapt (mentor)
  Differential Revision:https://reviews.freebsd.org/D16406

Modified:
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.files.mk
  head/share/mk/bsd.lib.mk

Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk  Tue Jul 24 16:31:16 2018(r336674)
+++ head/share/mk/bsd.confs.mk  Tue Jul 24 16:34:58 2018(r336675)
@@ -1,25 +1,38 @@
 # $FreeBSD$
 
 .if !target()
-.error bsd.conf.mk cannot be included directly.
+.  error bsd.conf.mk cannot be included directly.
 .endif
 
+.if !target()
+.  if target()
+.error bsd.dirs.mk must be included after bsd.confs.mk.
+.  endif
+
+:
+
 CONFGROUPS?=   CONFS
 
-.if !target(buildconfig)
-.for group in ${CONFGROUPS}
+.  if !target(buildconfig)
+.for group in ${CONFGROUPS}
 buildconfig: ${${group}}
-.endfor
-.endif
+.endfor
+.  endif
 
-.if !defined(_SKIP_BUILD)
+.  if !defined(_SKIP_BUILD)
 all: buildconfig
-.endif
+.  endif
 
-.if !target(installconfig)
-.for group in ${CONFGROUPS}
-.if defined(${group}) && !empty(${group})
+.  if !target(installconfig)
+.for group in ${CONFGROUPS}
+.  if defined(${group}) && !empty(${group})
 
+.if !target(afterinstallconfig)
+afterinstallconfig:
+.endif
+installconfig: realinstallconfig afterinstallconfig
+.ORDER:realinstallconfig afterinstallconfig
+
 ${group}OWN?=  ${SHAREOWN}
 ${group}GRP?=  ${SHAREGRP}
 ${group}MODE?= ${CONFMODE}
@@ -27,61 +40,100 @@ ${group}DIR?=  ${CONFDIR}
 STAGE_SETS+=   ${group:C,[/*],_,g}
 STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
 
-_${group}CONFS=
-.for cnf in ${${group}}
-.if defined(${group}OWN_${cnf:T}) || defined(${group}GRP_${cnf:T}) || \
-defined(${group}MODE_${cnf:T}) || defined(${group}DIR_${cnf:T}) || \
-defined(${group}NAME_${cnf:T}) || defined(${group}NAME)
-${group}OWN_${cnf:T}?= ${${group}OWN}
-${group}GRP_${cnf:T}?= ${${group}GRP}
-${group}MODE_${cnf:T}?=${${group}MODE}
-${group}DIR_${cnf:T}?= ${${group}DIR}
-.if defined(${group}NAME)
-${group}NAME_${cnf:T}?=${${group}NAME}
-.else
-${group}NAME_${cnf:T}?=${cnf:T}
-.endif
+.if defined(NO_ROOT)
+.  if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
+.if defined(${${group}PACKAGE})
+${group}TAGS+= package=${${group}PACKAGE:Uruntime}
+.else
+${group}TAGS+= package=${PACKAGE:Uruntime}
+.endif
+.  endif
+${group}TAGS+= config
+${group}TAG_ARGS=  -T ${${group}TAGS:[*]:S/ /,/g}
+.endif
+
+
+.if ${${group}DIR:S/^\///} == ${${group}DIR}
+# ${group}DIR specifies a variable that specifies a path
+DIRS+= ${${group}DIR}
+_${group}DIR=  ${${group}DIR}
+.else
+# ${group}DIR specifies a path
+DIRS+= ${group}DIR
+_${group}DIR=  ${group}DIR
+.endif
+
+
+.for cnf in ${${group}}
+${group}OWN_${cnf}?=   ${${group}OWN}
+${group}GRP_${cnf}?=   ${${group}GRP}
+${group}MODE_${cnf}?=  ${${group}MODE}
+${group}DIR_${cnf}?=   ${${group}DIR}
+.  if defined(${group}NAME)
+${group}NAME_${cnf}?=  ${${group}NAME}
+.  else
+${group}NAME_${cnf}?=  ${cnf:T}
+.  endif
+
+
+# Determine the directory for the current file.  Default to the parent group
+# DIR, then check to see how to pass that variable on below.
+${group}DIR_${cnf}?=   ${${group}DIR}
+.  if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}}
+# DIR specifies a variable that specifies a path
+_${group}DIR_${cnf}=   ${${group}DIR_${cnf}}
+.  else
+# DIR directly specifies a path
+_${group}DIR_${cnf}=   ${group}DIR_${cnf}
+.  endif
+${group}PREFIX_${cnf}= ${DESTDIR}${${_${group}DIR_${cnf}}}
+
+# Append DIR to DIRS if not already in place -- DIRS is already filtered, so
+# this is primarily to ease inspection.
+.  for d in ${DIRS}
+_DIRS+=${${d}}
+.  endfor
+.  if ${DIRS:M${_${group}DIR_${cnf}}} == ""
+.if ${_DIRS:M${${_${group}DIR_${cnf == ""
+DIRS+= ${_${group}DIR_${cnf}}
+.else
+_${group}DIR_${cnf}=   ${group}DIR
+.endif
+.  endif
+
+.  if defined(${group}NAME)
+${group}NAME_${cnf}?=  ${${group}NAME}
+.  else
+${group}NAME_${cnf}?=  ${cnf:T}
+.  endif # defined(${group}NAME)
+
+
 STAGE_AS_SETS+= ${cnf:T}
 STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
 # XXX {group}OWN,GRP,MODE
 STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}}
 stage_as.${cnf:T}: ${cnf}
 
-installconfig: _${group}INS_${cnf:T}
+realinstallconfig: installdirs-${_${group}DIR_${cnf}} _${group}INS_${cnf:T}
 _${group}INS_${cnf:T}: ${cnf}
- 

svn commit: r336676 - in head/sys: contrib/ipfilter/netinet net netgraph netinet netinet/cc netinet6 netipsec netpfil/ipfw netpfil/ipfw/nptv6 netpfil/ipfw/pmod netpfil/pf

2018-07-24 Thread Andrew Turner
Author: andrew
Date: Tue Jul 24 16:35:52 2018
New Revision: 336676
URL: https://svnweb.freebsd.org/changeset/base/336676

Log:
  Use the new VNET_DEFINE_STATIC macro when we are defining static VNET
  variables.
  
  Reviewed by:  bz
  Sponsored by: DARPA, AFRL
  Differential Revision:https://reviews.freebsd.org/D16147

Modified:
  head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
  head/sys/net/bpf.c
  head/sys/net/ieee8023ad_lacp.c
  head/sys/net/if.c
  head/sys/net/if_bridge.c
  head/sys/net/if_clone.c
  head/sys/net/if_disc.c
  head/sys/net/if_edsc.c
  head/sys/net/if_enc.c
  head/sys/net/if_epair.c
  head/sys/net/if_ethersubr.c
  head/sys/net/if_gif.c
  head/sys/net/if_gre.c
  head/sys/net/if_ipsec.c
  head/sys/net/if_lagg.c
  head/sys/net/if_llatbl.c
  head/sys/net/if_loop.c
  head/sys/net/if_me.c
  head/sys/net/if_vlan.c
  head/sys/net/netisr.c
  head/sys/net/route.c
  head/sys/net/rtsock.c
  head/sys/net/vnet.c
  head/sys/netgraph/ng_base.c
  head/sys/netgraph/ng_eiface.c
  head/sys/netgraph/ng_iface.c
  head/sys/netinet/cc/cc_cdg.c
  head/sys/netinet/cc/cc_chd.c
  head/sys/netinet/cc/cc_dctcp.c
  head/sys/netinet/cc/cc_hd.c
  head/sys/netinet/cc/cc_htcp.c
  head/sys/netinet/cc/cc_newreno.c
  head/sys/netinet/cc/cc_vegas.c
  head/sys/netinet/if_ether.c
  head/sys/netinet/igmp.c
  head/sys/netinet/in.c
  head/sys/netinet/in_gif.c
  head/sys/netinet/in_pcb.c
  head/sys/netinet/ip_carp.c
  head/sys/netinet/ip_divert.c
  head/sys/netinet/ip_gre.c
  head/sys/netinet/ip_icmp.c
  head/sys/netinet/ip_id.c
  head/sys/netinet/ip_input.c
  head/sys/netinet/ip_mroute.c
  head/sys/netinet/ip_options.c
  head/sys/netinet/ip_reass.c
  head/sys/netinet/tcp_fastopen.c
  head/sys/netinet/tcp_hostcache.c
  head/sys/netinet/tcp_subr.c
  head/sys/netinet/tcp_syncache.c
  head/sys/netinet/tcp_timewait.c
  head/sys/netinet/udp_usrreq.c
  head/sys/netinet6/frag6.c
  head/sys/netinet6/icmp6.c
  head/sys/netinet6/in6_gif.c
  head/sys/netinet6/in6_rmx.c
  head/sys/netinet6/in6_src.c
  head/sys/netinet6/ip6_gre.c
  head/sys/netinet6/ip6_mroute.c
  head/sys/netinet6/mld6.c
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6_nbr.c
  head/sys/netinet6/nd6_rtr.c
  head/sys/netinet6/scope6.c
  head/sys/netinet6/send.c
  head/sys/netipsec/ipsec.c
  head/sys/netipsec/key.c
  head/sys/netipsec/keysock.c
  head/sys/netpfil/ipfw/ip_fw2.c
  head/sys/netpfil/ipfw/ip_fw_bpf.c
  head/sys/netpfil/ipfw/ip_fw_dynamic.c
  head/sys/netpfil/ipfw/ip_fw_pfil.c
  head/sys/netpfil/ipfw/ip_fw_sockopt.c
  head/sys/netpfil/ipfw/nptv6/nptv6.c
  head/sys/netpfil/ipfw/pmod/tcpmod.c
  head/sys/netpfil/pf/if_pflog.c
  head/sys/netpfil/pf/if_pfsync.c
  head/sys/netpfil/pf/pf.c
  head/sys/netpfil/pf/pf_if.c
  head/sys/netpfil/pf/pf_ioctl.c
  head/sys/netpfil/pf/pf_norm.c
  head/sys/netpfil/pf/pf_osfp.c
  head/sys/netpfil/pf/pf_table.c

Modified: head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
==
--- head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c Tue Jul 24 16:34:58 
2018(r336675)
+++ head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c Tue Jul 24 16:35:52 
2018(r336676)
@@ -80,7 +80,7 @@ static void ipf_p_rpcb_fixlen __P((fr_info_t *, in
  */
 static frentry_t   rpcbfr; /* Skeleton rule for reference by entities
   this proxy creates. */
-static VNET_DEFINE(int,rpcbcnt);
+VNET_DEFINE_STATIC(int,rpcbcnt);
 #defineV_rpcbcnt   VNET(rpcbcnt)
/* Upper bound of allocated RPCB sessions. */
/* XXX rpcbcnt still requires locking. */

Modified: head/sys/net/bpf.c
==
--- head/sys/net/bpf.c  Tue Jul 24 16:34:58 2018(r336675)
+++ head/sys/net/bpf.c  Tue Jul 24 16:35:52 2018(r336676)
@@ -213,7 +213,7 @@ SYSCTL_INT(_net_bpf, OID_AUTO, zerocopy_enable, CTLFLA
 static SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_MPSAFE | CTLFLAG_RW,
 bpf_stats_sysctl, "bpf statistics portal");
 
-static VNET_DEFINE(int, bpf_optimize_writers) = 0;
+VNET_DEFINE_STATIC(int, bpf_optimize_writers) = 0;
 #defineV_bpf_optimize_writers VNET(bpf_optimize_writers)
 SYSCTL_INT(_net_bpf, OID_AUTO, optimize_writers, CTLFLAG_VNET | CTLFLAG_RW,
 &VNET_NAME(bpf_optimize_writers), 0,

Modified: head/sys/net/ieee8023ad_lacp.c
==
--- head/sys/net/ieee8023ad_lacp.c  Tue Jul 24 16:34:58 2018
(r336675)
+++ head/sys/net/ieee8023ad_lacp.c  Tue Jul 24 16:35:52 2018
(r336676)
@@ -194,13 +194,13 @@ static const char *lacp_format_portid(const struct lac
 static voidlacp_dprintf(const struct lacp_port *, const char *, ...)
__attribute__((__format__(__printf__, 2, 3)));
 
-static VNET_DEFINE(int, lacp_debug);
+VNET_DEFINE_STATIC(int, lacp_debug);
 #define  

svn commit: r336677 - head/sys/netinet

2018-07-24 Thread Andrew Turner
Author: andrew
Date: Tue Jul 24 16:45:01 2018
New Revision: 336677
URL: https://svnweb.freebsd.org/changeset/base/336677

Log:
  icmp_quotelen was accidentially changes in r336676, undo this.
  
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/netinet/ip_icmp.c

Modified: head/sys/netinet/ip_icmp.c
==
--- head/sys/netinet/ip_icmp.c  Tue Jul 24 16:35:52 2018(r336676)
+++ head/sys/netinet/ip_icmp.c  Tue Jul 24 16:45:01 2018(r336677)
@@ -140,7 +140,7 @@ SYSCTL_INT(_net_inet_icmp, OID_AUTO, reply_from_interf
&VNET_NAME(icmp_rfi), 0,
"ICMP reply from incoming interface for non-local packets");
 /* Router requirements RFC 1812 section 4.3.2.3 requires 576 - 28. */
-VNET_DEFINE_STATIC(int, icmp_quotelen) = 8;
+VNET_DEFINE_STATIC(int, icmp_quotelen) = 548;
 #defineV_icmp_quotelen VNET(icmp_quotelen)
 SYSCTL_INT(_net_inet_icmp, OID_AUTO, quotelen, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(icmp_quotelen), 0,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336678 - in head/sys: conf powerpc/ofw

2018-07-24 Thread Breno Leitao
Author: leitao
Date: Tue Jul 24 16:52:52 2018
New Revision: 336678
URL: https://svnweb.freebsd.org/changeset/base/336678

Log:
  ofw: Load initrd file
  
  This is an OFW initrd module that would load the initrd from device tree
  parameters and give the to the md driver.
  
  With this patch, it is possible to pass a rootfs image through kexec in 
PowerNV
  mode (powerpc64). In order to user it, you should set the MD_ROOT_MEM option 
in
  your kernel configuration.
  
  Reviewed by: jhibbits
  Approved by: jhibbits (mentor)
  Differential Revision: https://reviews.freebsd.org/D15705

Added:
  head/sys/powerpc/ofw/ofw_initrd.c   (contents, props changed)
Modified:
  head/sys/conf/files.powerpc

Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Tue Jul 24 16:45:01 2018(r336677)
+++ head/sys/conf/files.powerpc Tue Jul 24 16:52:52 2018(r336678)
@@ -163,6 +163,7 @@ powerpc/ofw/ofwcall32.S optionalaim 
powerpc
 powerpc/ofw/ofwcall64.Soptionalaim powerpc64
 powerpc/ofw/openpic_ofw.c  standard
 powerpc/ofw/rtas.c optionalaim
+powerpc/ofw/ofw_initrd.c   optionalmd_root_mem powerpc64
 powerpc/powermac/ata_kauai.c   optionalpowermac ata | powermac atamacio
 powerpc/powermac/ata_macio.c   optionalpowermac ata | powermac atamacio
 powerpc/powermac/ata_dbdma.c   optionalpowermac ata | powermac atamacio

Added: head/sys/powerpc/ofw/ofw_initrd.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/powerpc/ofw/ofw_initrd.c   Tue Jul 24 16:52:52 2018
(r336678)
@@ -0,0 +1,159 @@
+/*-
+ * Copyright (C) 2018 Breno Leitao
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include "opt_md.h"
+
+#ifdef MD_ROOT_MEM
+extern u_char *mfs_root;
+extern uint32_t mfs_root_size;
+#else
+#warning "MD_ROOT_MEM should be set to use ofw initrd as a md device"
+#endif
+
+/* bus entry points */
+static int ofw_initrd_probe(device_t dev);
+static int ofw_initrd_attach(device_t dev);
+static void ofw_initrd_identify(driver_t *driver, device_t parent);
+
+struct ofw_initrd_softc {
+   device_tsc_dev;
+   vm_paddr_t  start;
+   vm_paddr_t  end;
+};
+
+static int
+ofw_initrd_probe(device_t dev)
+{
+   phandle_t chosen;
+
+   /* limit this device to one unit */
+   if (device_get_unit(dev) != 0)
+   return (ENXIO);
+
+   chosen = OF_finddevice("/chosen");
+   if (chosen <= 0) {
+   return (ENXIO);
+   }
+
+   if (!OF_hasprop(chosen, "linux,initrd-start") ||
+   !OF_hasprop(chosen, "linux,initrd-end"))
+   return (ENXIO);
+
+   device_set_desc(dev, "OFW initrd memregion loader");
+   return (BUS_PROBE_DEFAULT);
+}
+
+static int
+ofw_initrd_attach(device_t dev)
+{
+   struct ofw_initrd_softc *sc;
+   vm_paddr_t start, end;
+   phandle_t chosen;
+   pcell_t cell[2];
+   ssize_t size;
+
+   sc = device_get_softc(dev);
+
+   chosen = OF_finddevice("/chosen");
+   if (chosen <= 0) {
+   device_printf(dev, "/chosen not found\n");
+   return (ENXIO);
+   }
+
+   size = OF_getencprop(chosen, "linux,initrd-start", cell, sizeof(cell));
+   if (size == 4)
+   start = cell[0];
+   else if (size == 8)
+   start = (uint64_t)cell[0] << 32 | cell[1];
+   

svn commit: r336679 - in head: share/misc usr.bin/calendar/calendars

2018-07-24 Thread John Hixson
Author: jhixson (ports committer)
Date: Tue Jul 24 18:33:26 2018
New Revision: 336679
URL: https://svnweb.freebsd.org/changeset/base/336679

Log:
  Add jhixson to committers-ports.dot and calendar.freebsd
  
  Approved by:  miwi (mentor), kmoore (mentor), araujo (mentor)
  Differential Revision:https://reviews.freebsd.org/D16424

Modified:
  head/share/misc/committers-ports.dot
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/share/misc/committers-ports.dot
==
--- head/share/misc/committers-ports.dotTue Jul 24 16:52:52 2018
(r336678)
+++ head/share/misc/committers-ports.dotTue Jul 24 18:33:26 2018
(r336679)
@@ -133,6 +133,7 @@ jase [label="Jase Thew\nj...@freebsd.org\n2012/05/30"]
 jbeich [label="Jan Beich\njbe...@freebsd.org\n2015/01/19"]
 jgh [label="Jason Helfman\n...@freebsd.org\n2011/12/16"]
 jhale [label="Jason E. Hale\njh...@freebsd.org\n2012/09/10"]
+jhixson [label="John Hixson\njhix...@freebsd.org\n2018/07/16"]
 jkim [label="Jung-uk Kim\nj...@freebsd.org\n2007/09/12"]
 jlaffaye [label="Julien Laffaye\njlaff...@freebsd.org\n2011/06/06"]
 jmd [label="Johannes M. Dieterich\n...@freebsd.org\n2017/01/09"]
@@ -294,6 +295,7 @@ amdmi3 -> arrowd
 
 antoine -> dumbbell
 
+araujo -> jhixson
 araujo -> lippe
 araujo -> pclin
 araujo -> pgollucci
@@ -471,6 +473,8 @@ jrm -> jwb
 
 junovitch -> tz
 
+kmoore -> jhixson
+
 knu -> daichi
 knu -> maho
 knu -> nobutaka
@@ -556,6 +560,7 @@ miwi -> dhn
 miwi -> farrokhi
 miwi -> fluffy
 miwi -> gahr
+miwi -> jhixson
 miwi -> joneum
 miwi -> jsm
 miwi -> kmoore

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdTue Jul 24 16:52:52 
2018(r336678)
+++ head/usr.bin/calendar/calendars/calendar.freebsdTue Jul 24 18:33:26 
2018(r336679)
@@ -402,6 +402,7 @@
 10/30  Olli Hauer  born in Sindelfingen, Germany, 1968
 10/31  Taras Korenko  born in Cherkasy region, Ukraine, 1980
 11/03  Ryan Stone  born in Ottawa, Ontario, Canada, 1985
+11/04  John Hixson  born in Burlingame, California, 
United States, 1974
 11/05  M. Warner Losh  born in Kansas City, Kansas, United 
States, 1966
 11/06  Michael Zhilin  born in Stary Oskol, USSR, 1985
 11/08  Joseph R. Mingrone  born in Charlottetown, Prince 
Edward Island, Canada, 1976
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336680 - head/share/man/man4

2018-07-24 Thread David C Somayajulu
Author: davidcs
Date: Tue Jul 24 18:39:46 2018
New Revision: 336680
URL: https://svnweb.freebsd.org/changeset/base/336680

Log:
  Update man page with support for 41000 Series adapters
  
  MFC after:5 days

Modified:
  head/share/man/man4/qlnxe.4

Modified: head/share/man/man4/qlnxe.4
==
--- head/share/man/man4/qlnxe.4 Tue Jul 24 18:33:26 2018(r336679)
+++ head/share/man/man4/qlnxe.4 Tue Jul 24 18:39:46 2018(r336680)
@@ -63,6 +63,8 @@ chipsets:
 .Bl -bullet -compact
 .It
 QLogic 45000 series
+.It
+QLogic 41000 series
 .El
 .Sh SUPPORT
 For support questions please contact your Cavium approved reseller or
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336681 - head/share/man/man9

2018-07-24 Thread Bjoern A. Zeeb
Author: bz
Date: Tue Jul 24 18:51:38 2018
New Revision: 336681
URL: https://svnweb.freebsd.org/changeset/base/336681

Log:
  Updated .Dd missed in r336674.

Modified:
  head/share/man/man9/vnet.9

Modified: head/share/man/man9/vnet.9
==
--- head/share/man/man9/vnet.9  Tue Jul 24 18:39:46 2018(r336680)
+++ head/share/man/man9/vnet.9  Tue Jul 24 18:51:38 2018(r336681)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2018
+.Dd July 24, 2018
 .Dt VNET 9
 .Os
 .Sh NAME
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336682 - head/share/man/man4

2018-07-24 Thread Ravi Pokala
Author: rpokala
Date: Tue Jul 24 19:21:11 2018
New Revision: 336682
URL: https://svnweb.freebsd.org/changeset/base/336682

Log:
  Update .Dd in light of r336662.
  
  MFC after:1 week
  X-MFC-With:   r336662
  Pointy-hat to:rpokala

Modified:
  head/share/man/man4/jedec_dimm.4
  head/share/man/man4/jedec_ts.4

Modified: head/share/man/man4/jedec_dimm.4
==
--- head/share/man/man4/jedec_dimm.4Tue Jul 24 18:51:38 2018
(r336681)
+++ head/share/man/man4/jedec_dimm.4Tue Jul 24 19:21:11 2018
(r336682)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 22, 2018
+.Dd July 24, 2018
 .Dt JEDEC_DIMM 4
 .Os
 .Sh NAME

Modified: head/share/man/man4/jedec_ts.4
==
--- head/share/man/man4/jedec_ts.4  Tue Jul 24 18:51:38 2018
(r336681)
+++ head/share/man/man4/jedec_ts.4  Tue Jul 24 19:21:11 2018
(r336682)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 9, 2017
+.Dd July 24, 2018
 .Dt JEDEC_TS 4
 .Os
 .Sh NAME
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336683 - in head/sys: amd64/amd64 i386/i386

2018-07-24 Thread Konstantin Belousov
Author: kib
Date: Tue Jul 24 19:22:52 2018
New Revision: 336683
URL: https://svnweb.freebsd.org/changeset/base/336683

Log:
  Extend ranges of the critical sections to ensure that context switch
  code never sees FPU pcb flags not consistent with the hardware state.
  
  This is uncovered by the eager FPU switch mode.
  
  Analyzed, reviewed and tested by: gleb
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week

Modified:
  head/sys/amd64/amd64/fpu.c
  head/sys/amd64/amd64/machdep.c
  head/sys/i386/i386/machdep.c
  head/sys/i386/i386/npx.c

Modified: head/sys/amd64/amd64/fpu.c
==
--- head/sys/amd64/amd64/fpu.c  Tue Jul 24 19:21:11 2018(r336682)
+++ head/sys/amd64/amd64/fpu.c  Tue Jul 24 19:22:52 2018(r336683)
@@ -783,22 +783,22 @@ fpugetregs(struct thread *td)
int max_ext_n, i, owned;
 
pcb = td->td_pcb;
+   critical_enter();
if ((pcb->pcb_flags & PCB_USERFPUINITDONE) == 0) {
bcopy(fpu_initialstate, get_pcb_user_save_pcb(pcb),
cpu_max_ext_state_size);
get_pcb_user_save_pcb(pcb)->sv_env.en_cw =
pcb->pcb_initial_fpucw;
fpuuserinited(td);
+   critical_exit();
return (_MC_FPOWNED_PCB);
}
-   critical_enter();
if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) {
fpusave(get_pcb_user_save_pcb(pcb));
owned = _MC_FPOWNED_FPU;
} else {
owned = _MC_FPOWNED_PCB;
}
-   critical_exit();
if (use_xsave) {
/*
 * Handle partially saved state.
@@ -818,6 +818,7 @@ fpugetregs(struct thread *td)
*xstate_bv |= bit;
}
}
+   critical_exit();
return (owned);
 }
 
@@ -826,6 +827,7 @@ fpuuserinited(struct thread *td)
 {
struct pcb *pcb;
 
+   CRITICAL_ASSERT(td);
pcb = td->td_pcb;
if (PCB_USER_FPU(pcb))
set_pcb_flags(pcb,
@@ -884,26 +886,25 @@ fpusetregs(struct thread *td, struct savefpu *addr, ch
 
addr->sv_env.en_mxcsr &= cpu_mxcsr_mask;
pcb = td->td_pcb;
+   error = 0;
critical_enter();
if (td == PCPU_GET(fpcurthread) && PCB_USER_FPU(pcb)) {
error = fpusetxstate(td, xfpustate, xfpustate_size);
-   if (error != 0) {
-   critical_exit();
-   return (error);
+   if (error == 0) {
+   bcopy(addr, get_pcb_user_save_td(td), sizeof(*addr));
+   fpurestore(get_pcb_user_save_td(td));
+   set_pcb_flags(pcb, PCB_FPUINITDONE |
+   PCB_USERFPUINITDONE);
}
-   bcopy(addr, get_pcb_user_save_td(td), sizeof(*addr));
-   fpurestore(get_pcb_user_save_td(td));
-   critical_exit();
-   set_pcb_flags(pcb, PCB_FPUINITDONE | PCB_USERFPUINITDONE);
} else {
-   critical_exit();
error = fpusetxstate(td, xfpustate, xfpustate_size);
-   if (error != 0)
-   return (error);
-   bcopy(addr, get_pcb_user_save_td(td), sizeof(*addr));
-   fpuuserinited(td);
+   if (error == 0) {
+   bcopy(addr, get_pcb_user_save_td(td), sizeof(*addr));
+   fpuuserinited(td);
+   }
}
-   return (0);
+   critical_exit();
+   return (error);
 }
 
 /*
@@ -1077,6 +1078,7 @@ fpu_kern_enter(struct thread *td, struct fpu_kern_ctx 
ctx->flags = FPU_KERN_CTX_DUMMY | FPU_KERN_CTX_INUSE;
return;
}
+   critical_enter();
KASSERT(!PCB_USER_FPU(pcb) || pcb->pcb_save ==
get_pcb_user_save_pcb(pcb), ("mangled pcb_save"));
ctx->flags = FPU_KERN_CTX_INUSE;
@@ -1087,7 +1089,7 @@ fpu_kern_enter(struct thread *td, struct fpu_kern_ctx 
pcb->pcb_save = fpu_kern_ctx_savefpu(ctx);
set_pcb_flags(pcb, PCB_KERNFPU);
clear_pcb_flags(pcb, PCB_FPUINITDONE);
-   return;
+   critical_exit();
 }
 
 int
@@ -1105,7 +1107,6 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx 
 
clear_pcb_flags(pcb,  PCB_FPUNOSAVE | PCB_FPUINITDONE);
start_emulating();
-   critical_exit();
} else {
KASSERT((ctx->flags & FPU_KERN_CTX_INUSE) != 0,
("leaving not inuse ctx"));
@@ -1119,7 +1120,6 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx 
critical_enter();
if (curthread == PCPU_GET(fpcurthread))
fpudrop();
-   critical_exit();
pcb->pcb_save = ctx->prev;
}
 
@@ -1136,6 +1136,7 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx 
   

svn commit: r336685 - head/usr.sbin

2018-07-24 Thread Mark Johnston
Author: markj
Date: Tue Jul 24 20:20:17 2018
New Revision: 336685
URL: https://svnweb.freebsd.org/changeset/base/336685

Log:
  Build ofwdump on riscv.
  
  Sponsored by: The FreeBSD Foundation

Added:
  head/usr.sbin/Makefile.riscv   (contents, props changed)

Added: head/usr.sbin/Makefile.riscv
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.sbin/Makefile.riscvTue Jul 24 20:20:17 2018
(r336685)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+SUBDIR+=   ofwdump
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336686 - head/sys/riscv/riscv

2018-07-24 Thread Mark Johnston
Author: markj
Date: Tue Jul 24 21:02:11 2018
New Revision: 336686
URL: https://svnweb.freebsd.org/changeset/base/336686

Log:
  Embed a simplebus_softc in struct soc_softc.
  
  This is required by the definition of the soc driver.
  
  Reviewed by:  br
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/riscv/riscv/soc.c

Modified: head/sys/riscv/riscv/soc.c
==
--- head/sys/riscv/riscv/soc.c  Tue Jul 24 20:20:17 2018(r336685)
+++ head/sys/riscv/riscv/soc.c  Tue Jul 24 21:02:11 2018(r336686)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include 
 
 struct soc_softc {
+   struct simplebus_softc  simplebus_sc;
device_tdev;
 };
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336687 - head/sys/fs/msdosfs

2018-07-24 Thread Ed Maste
Author: emaste
Date: Tue Jul 24 21:10:17 2018
New Revision: 336687
URL: https://svnweb.freebsd.org/changeset/base/336687

Log:
  Revert msdosfs MAKEFS #ifdef changes from r319870
  
  These changes are not needed for current msdosfs makefs WIP.
  
  Submitted by: Siva Mahadevan
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/fs/msdosfs/denode.h
  head/sys/fs/msdosfs/direntry.h
  head/sys/fs/msdosfs/fat.h

Modified: head/sys/fs/msdosfs/denode.h
==
--- head/sys/fs/msdosfs/denode.hTue Jul 24 21:02:11 2018
(r336686)
+++ head/sys/fs/msdosfs/denode.hTue Jul 24 21:10:17 2018
(r336687)
@@ -211,7 +211,7 @@ struct denode {
 ((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), 
\
 putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16))
 
-#if defined(_KERNEL) || defined(MAKEFS)
+#ifdef _KERNEL
 
 #defineVTODE(vp)   ((struct denode *)(vp)->v_data)
 #defineDETOV(de)   ((de)->de_vnode)
@@ -281,6 +281,5 @@ int deupdat(struct denode *dep, int waitfor);
 int removede(struct denode *pdep, struct denode *dep);
 int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred);
 int doscheckpath( struct denode *source, struct denode *target);
-#endif /* _KERNEL || MAKEFS */
+#endif /* _KERNEL */
 #endif /* !_FS_MSDOSFS_DENODE_H_ */
-

Modified: head/sys/fs/msdosfs/direntry.h
==
--- head/sys/fs/msdosfs/direntry.h  Tue Jul 24 21:02:11 2018
(r336686)
+++ head/sys/fs/msdosfs/direntry.h  Tue Jul 24 21:10:17 2018
(r336687)
@@ -135,7 +135,7 @@ struct winentry {
 #define DD_YEAR_MASK   0xFE00  /* year - 1980 */
 #define DD_YEAR_SHIFT  9
 
-#if defined(_KERNEL) || defined(MAKEFS)
+#ifdef _KERNEL
 struct mbnambuf {
size_t  nb_len;
int nb_last_id;
@@ -161,5 +161,5 @@ int win2unixfn(struct mbnambuf *nbp, struct winentry *
 uint8_t winChksum(uint8_t *name);
 intwinSlotCnt(const u_char *un, size_t unlen, struct msdosfsmount *pmp);
 size_t winLenFixup(const u_char *un, size_t unlen);
-#endif /* _KERNEL || MAKEFS */
+#endif /* _KERNEL */
 #endif /* !_FS_MSDOSFS_DIRENTRY_H_ */

Modified: head/sys/fs/msdosfs/fat.h
==
--- head/sys/fs/msdosfs/fat.h   Tue Jul 24 21:02:11 2018(r336686)
+++ head/sys/fs/msdosfs/fat.h   Tue Jul 24 21:10:17 2018(r336687)
@@ -82,7 +82,7 @@
 
 #defineMSDOSFSEOF(pmp, cn) cn) | ~(pmp)->pm_fatmask) & 
CLUST_EOFS) == CLUST_EOFS)
 
-#if defined(_KERNEL) || defined(MAKEFS)
+#ifdef _KERNEL
 /*
  * These are the values for the function argument to the function
  * fatentry().
@@ -105,5 +105,5 @@ int extendfile(struct denode *dep, u_long count, struc
 void fc_purge(struct denode *dep, u_int frcn);
 int markvoldirty(struct msdosfsmount *pmp, int dirty);
 
-#endif /* _KERNEL || MAKEFS */
+#endif /* _KERNEL */
 #endif /* !_FS_MSDOSFS_FAT_H_ */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r336675 - head/share/mk

2018-07-24 Thread Antoine Brodin
On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis  wrote:
> Author: brd
> Date: Tue Jul 24 16:34:58 2018
> New Revision: 336675
> URL: https://svnweb.freebsd.org/changeset/base/336675
>
> Log:
>   Convert bsd.confs.mk to support DIRS.
>
>   This paves the way for moving config files out of head/etc and into the
>   directories with the src.
>
>   Approved by:  bapt (mentor)
>   Differential Revision:https://reviews.freebsd.org/D16406
>
> Modified:
>   head/share/mk/bsd.confs.mk
>   head/share/mk/bsd.files.mk
>   head/share/mk/bsd.lib.mk

This seems broken, with lots of ports I have this error:

make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk
make[1]: Fatal errors encountered -- cannot continue

Please fix or revert.

Antoine (with hat: portmgr)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r336675 - head/share/mk

2018-07-24 Thread Brad Davis
On Tue, Jul 24, 2018, at 3:32 PM, Antoine Brodin wrote:
> On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis  wrote:
> > Author: brd
> > Date: Tue Jul 24 16:34:58 2018
> > New Revision: 336675
> > URL: https://svnweb.freebsd.org/changeset/base/336675
> >
> > Log:
> >   Convert bsd.confs.mk to support DIRS.
> >
> >   This paves the way for moving config files out of head/etc and into the
> >   directories with the src.
> >
> >   Approved by:  bapt (mentor)
> >   Differential Revision:https://reviews.freebsd.org/D16406
> >
> > Modified:
> >   head/share/mk/bsd.confs.mk
> >   head/share/mk/bsd.files.mk
> >   head/share/mk/bsd.lib.mk
> 
> This seems broken, with lots of ports I have this error:
> 
> make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk
> make[1]: Fatal errors encountered -- cannot continue

Do you have /usr/share/mk/bsd.dirs.mk from r336640?


Regards,
Brad Davis
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r336675 - head/share/mk

2018-07-24 Thread Brad Davis
On Tue, Jul 24, 2018, at 3:55 PM, Brad Davis wrote:
> On Tue, Jul 24, 2018, at 3:32 PM, Antoine Brodin wrote:
> > On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis  wrote:
> > > Author: brd
> > > Date: Tue Jul 24 16:34:58 2018
> > > New Revision: 336675
> > > URL: https://svnweb.freebsd.org/changeset/base/336675
> > >
> > > Log:
> > >   Convert bsd.confs.mk to support DIRS.
> > >
> > >   This paves the way for moving config files out of head/etc and into the
> > >   directories with the src.
> > >
> > >   Approved by:  bapt (mentor)
> > >   Differential Revision:https://reviews.freebsd.org/D16406
> > >
> > > Modified:
> > >   head/share/mk/bsd.confs.mk
> > >   head/share/mk/bsd.files.mk
> > >   head/share/mk/bsd.lib.mk
> > 
> > This seems broken, with lots of ports I have this error:
> > 
> > make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk
> > make[1]: Fatal errors encountered -- cannot continue
> 
> Do you have /usr/share/mk/bsd.dirs.mk from r336640?

Opps, I see what the problem is.  I'll whip up a review real quick.


Regards,
Brad Davis
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336688 - in head: lib/libc/powerpcspe/gen sys/powerpc/include

2018-07-24 Thread Justin Hibbits
Author: jhibbits
Date: Tue Jul 24 22:04:56 2018
New Revision: 336688
URL: https://svnweb.freebsd.org/changeset/base/336688

Log:
  Fix floating point exception definitions for powerpcspe
  
  These were incorrectly implemented in the original port.

Modified:
  head/lib/libc/powerpcspe/gen/fpgetmask.c
  head/lib/libc/powerpcspe/gen/fpsetmask.c
  head/sys/powerpc/include/ieeefp.h

Modified: head/lib/libc/powerpcspe/gen/fpgetmask.c
==
--- head/lib/libc/powerpcspe/gen/fpgetmask.cTue Jul 24 21:10:17 2018
(r336687)
+++ head/lib/libc/powerpcspe/gen/fpgetmask.cTue Jul 24 22:04:56 2018
(r336688)
@@ -44,6 +44,6 @@ fpgetmask()
uint32_t fpscr;
 
__asm__ __volatile("mfspr %0, %1" : "=r"(fpscr) : "K"(SPR_SPEFSCR));
-   return ((fp_except_t)((fpscr >> 3) & 0x1f));
+   return ((fp_except_t)((fpscr >> 2) & 0x1f));
 }
 #endif

Modified: head/lib/libc/powerpcspe/gen/fpsetmask.c
==
--- head/lib/libc/powerpcspe/gen/fpsetmask.cTue Jul 24 21:10:17 2018
(r336687)
+++ head/lib/libc/powerpcspe/gen/fpsetmask.cTue Jul 24 22:04:56 2018
(r336688)
@@ -45,8 +45,8 @@ fpsetmask(fp_except_t mask)
fp_rnd_t old;
 
__asm__ __volatile("mfspr %0, %1" : "=r"(fpscr) : "K"(SPR_SPEFSCR));
-   old = (fp_rnd_t)((fpscr >> 3) & 0x1f);
-   fpscr = (fpscr & 0xff07) | (mask << 3);
+   old = (fp_rnd_t)((fpscr >> 2) & 0x1f);
+   fpscr = (fpscr & 0xff83) | (mask << 2);
__asm__ __volatile("mtspr %1,%0" :: "r"(fpscr), "K"(SPR_SPEFSCR));
return (old);
 }

Modified: head/sys/powerpc/include/ieeefp.h
==
--- head/sys/powerpc/include/ieeefp.h   Tue Jul 24 21:10:17 2018
(r336687)
+++ head/sys/powerpc/include/ieeefp.h   Tue Jul 24 22:04:56 2018
(r336688)
@@ -11,11 +11,19 @@
 /* Deprecated historical FPU control interface */
 
 typedef int fp_except_t;
+#ifdef __SPE__
+#define FP_X_OFL   0x01/* overflow exception */
+#define FP_X_UFL   0x02/* underflow exception */
+#define FP_X_DZ0x04/* divide-by-zero exception */
+#define FP_X_INV   0x08/* invalid operation exception */
+#define FP_X_IMP   0x10/* imprecise (loss of precision) */
+#else
 #define FP_X_IMP   0x01/* imprecise (loss of precision) */
 #define FP_X_DZ0x02/* divide-by-zero exception */
 #define FP_X_UFL   0x04/* underflow exception */
 #define FP_X_OFL   0x08/* overflow exception */
 #define FP_X_INV   0x10/* invalid operation exception */
+#endif
 
 typedef enum {
 FP_RN=0,   /* round to nearest representable number */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336689 - head/lib/libc/powerpcspe/gen

2018-07-24 Thread Justin Hibbits
Author: jhibbits
Date: Tue Jul 24 22:05:55 2018
New Revision: 336689
URL: https://svnweb.freebsd.org/changeset/base/336689

Log:
  Fix register usage in fabs(3) for powerpcspe
  
  This still used the FPU register definition, which gcc converted to using %r1
  (stack register).  Fix to use %r3.

Modified:
  head/lib/libc/powerpcspe/gen/fabs.S

Modified: head/lib/libc/powerpcspe/gen/fabs.S
==
--- head/lib/libc/powerpcspe/gen/fabs.S Tue Jul 24 22:04:56 2018
(r336688)
+++ head/lib/libc/powerpcspe/gen/fabs.S Tue Jul 24 22:05:55 2018
(r336689)
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
  * double fabs(double)
  */
 ENTRY(fabs)
-   efdabs  %f1,%f1
+   efdabs  %r3,%r3
blr
 END(fabs)
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r336675 - head/share/mk

2018-07-24 Thread Brad Davis
On Tue, Jul 24, 2018, at 3:55 PM, Brad Davis wrote:
> On Tue, Jul 24, 2018, at 3:32 PM, Antoine Brodin wrote:
> > On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis  wrote:
> > > Author: brd
> > > Date: Tue Jul 24 16:34:58 2018
> > > New Revision: 336675
> > > URL: https://svnweb.freebsd.org/changeset/base/336675
> > >
> > > Log:
> > >   Convert bsd.confs.mk to support DIRS.
> > >
> > >   This paves the way for moving config files out of head/etc and into the
> > >   directories with the src.
> > >
> > >   Approved by:  bapt (mentor)
> > >   Differential Revision:https://reviews.freebsd.org/D16406
> > >
> > > Modified:
> > >   head/share/mk/bsd.confs.mk
> > >   head/share/mk/bsd.files.mk
> > >   head/share/mk/bsd.lib.mk
> > 
> > This seems broken, with lots of ports I have this error:
> > 
> > make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk
> > make[1]: Fatal errors encountered -- cannot continue
> 
> Do you have /usr/share/mk/bsd.dirs.mk from r336640?

I opened: https://reviews.freebsd.org/D16434


Regards,
Brad Davis

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


svn commit: r336690 - head/sys/net

2018-07-24 Thread Marius Strobl
Author: marius
Date: Tue Jul 24 23:40:27 2018
New Revision: 336690
URL: https://svnweb.freebsd.org/changeset/base/336690

Log:
  Since r336611, n is only used for INET in iflib_parse_header().
  Reported by:  rpokala

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==
--- head/sys/net/iflib.cTue Jul 24 22:05:55 2018(r336689)
+++ head/sys/net/iflib.cTue Jul 24 23:40:27 2018(r336690)
@@ -2874,7 +2874,7 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, 
 {
if_shared_ctx_t sctx = txq->ift_ctx->ifc_sctx;
struct ether_vlan_header *eh;
-   struct mbuf *m, *n;
+   struct mbuf *m;
 
m = *mp;
if ((sctx->isc_flags & IFLIB_NEED_SCRATCH) &&
@@ -2910,6 +2910,7 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, 
 #ifdef INET
case ETHERTYPE_IP:
{
+   struct mbuf *n;
struct ip *ip = NULL;
struct tcphdr *th = NULL;
int minthlen;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336691 - head/lib/clang/include/llvm/Config

2018-07-24 Thread Ed Maste
Author: emaste
Date: Wed Jul 25 00:06:18 2018
New Revision: 336691
URL: https://svnweb.freebsd.org/changeset/base/336691

Log:
  llvm: remove __FreeBSD_version conditionals
  
  All supported FreeBSD build host versions have backtrace.h, so we can
  just eliminate that test.  For futimes() we can test the compiler's
  built-in __FreeBSD__ major version rather than relying on including
  osreldate.h.  This should reduce the frequency with which Clang gets
  rebuilt when building world.
  
  Reviewed by:  dim
  Sponsored by: The FreeBSD Foundation

Modified:
  head/lib/clang/include/llvm/Config/config.h

Modified: head/lib/clang/include/llvm/Config/config.h
==
--- head/lib/clang/include/llvm/Config/config.h Tue Jul 24 23:40:27 2018
(r336690)
+++ head/lib/clang/include/llvm/Config/config.h Wed Jul 25 00:06:18 2018
(r336691)
@@ -2,9 +2,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-/* Get __FreeBSD_version. */
-#include 
-
 /* Exported configuration */
 #include "llvm/Config/llvm-config.h"
 
@@ -17,12 +14,10 @@
 /* Define to 1 to enable crash overrides, and to 0 otherwise. */
 #define ENABLE_CRASH_OVERRIDES 1
 
-#if __FreeBSD_version >= 152
 /* Define to 1 if you have the `backtrace' function. */
 #define HAVE_BACKTRACE TRUE
 
 #define BACKTRACE_HEADER 
-#endif
 
 /* Define to 1 if you have the  header file. */
 /* #undef HAVE_CRASHREPORTERCLIENT_H */
@@ -81,7 +76,7 @@
 /* #undef HAVE_FFI_H */
 
 /* Define to 1 if you have the `futimens' function. */
-#if __FreeBSD_version >= 1100056
+#if __FreeBSD__ >= 11
 #define HAVE_FUTIMENS 1
 #endif
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336692 - head/sys/sys

2018-07-24 Thread Ed Maste
Author: emaste
Date: Wed Jul 25 00:18:21 2018
New Revision: 336692
URL: https://svnweb.freebsd.org/changeset/base/336692

Log:
  sockopt.h: remove stale comment
  
  Some old compatibility bits were removed in r227503 but this comment
  was left behind.
  
  Reported by:  br, via review D11962
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/sys/sockopt.h

Modified: head/sys/sys/sockopt.h
==
--- head/sys/sys/sockopt.h  Wed Jul 25 00:06:18 2018(r336691)
+++ head/sys/sys/sockopt.h  Wed Jul 25 00:18:21 2018(r336692)
@@ -62,7 +62,6 @@ int   sosetopt(struct socket *so, struct sockopt *sopt);
 intsogetopt(struct socket *so, struct sockopt *sopt);
 intsooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen);
 intsooptcopyout(struct sockopt *sopt, const void *buf, size_t len);
-/* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */
 intsoopt_getm(struct sockopt *sopt, struct mbuf **mp);
 intsoopt_mcopyin(struct sockopt *sopt, struct mbuf *m);
 intsoopt_mcopyout(struct sockopt *sopt, struct mbuf *m);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336693 - head/share/mk

2018-07-24 Thread Brad Davis
Author: brd
Date: Wed Jul 25 00:33:09 2018
New Revision: 336693
URL: https://svnweb.freebsd.org/changeset/base/336693

Log:
  Actually install bsd.dirs.mk
  
  Approved by:  allanjude (mentor)
  Differential Revision:https://reviews.freebsd.org/D16434

Modified:
  head/share/mk/Makefile

Modified: head/share/mk/Makefile
==
--- head/share/mk/Makefile  Wed Jul 25 00:18:21 2018(r336692)
+++ head/share/mk/Makefile  Wed Jul 25 00:33:09 2018(r336693)
@@ -23,6 +23,7 @@ FILES=\
bsd.cpu.mk \
bsd.crunchgen.mk \
bsd.dep.mk \
+   bsd.dirs.mk \
bsd.doc.mk \
bsd.dtb.mk \
bsd.endian.mk \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r336675 - head/share/mk

2018-07-24 Thread Brad Davis
On Tue, Jul 24, 2018, at 4:06 PM, Brad Davis wrote:
> On Tue, Jul 24, 2018, at 3:55 PM, Brad Davis wrote:
> > On Tue, Jul 24, 2018, at 3:32 PM, Antoine Brodin wrote:
> > > On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis  wrote:
> > > > Author: brd
> > > > Date: Tue Jul 24 16:34:58 2018
> > > > New Revision: 336675
> > > > URL: https://svnweb.freebsd.org/changeset/base/336675
> > > >
> > > > Log:
> > > >   Convert bsd.confs.mk to support DIRS.
> > > >
> > > >   This paves the way for moving config files out of head/etc and into 
> > > > the
> > > >   directories with the src.
> > > >
> > > >   Approved by:  bapt (mentor)
> > > >   Differential Revision:https://reviews.freebsd.org/D16406
> > > >
> > > > Modified:
> > > >   head/share/mk/bsd.confs.mk
> > > >   head/share/mk/bsd.files.mk
> > > >   head/share/mk/bsd.lib.mk
> > > 
> > > This seems broken, with lots of ports I have this error:
> > > 
> > > make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk
> > > make[1]: Fatal errors encountered -- cannot continue
> > 
> > Do you have /usr/share/mk/bsd.dirs.mk from r336640?
> 
> I opened: https://reviews.freebsd.org/D16434

Committed as r336693.

Thanks for letting me know and sorry for the trouble.


Regards,
Brad Davis

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


svn commit: r336695 - in head/sys: dev/qlnx/qlnxe modules/qlnx modules/qlnx/qlnxe modules/qlnx/qlnxev

2018-07-24 Thread David C Somayajulu
Author: davidcs
Date: Wed Jul 25 02:36:55 2018
New Revision: 336695
URL: https://svnweb.freebsd.org/changeset/base/336695

Log:
  Remove support for QLNX_RCV_IN_TASKQ - i.e., Rx only in TaskQ.
  Added support for LLDP passthru
  Upgrade ECORE to version 8.33.5.0
  Upgrade STORMFW to version 8.33.7.0
  Added support for SRIOV
  
  MFC after:5 days

Added:
  head/sys/dev/qlnx/qlnxe/ecore_iwarp.h   (contents, props changed)
  head/sys/dev/qlnx/qlnxe/ecore_mng_tlv.c   (contents, props changed)
  head/sys/dev/qlnx/qlnxe/ecore_rdma.h   (contents, props changed)
  head/sys/dev/qlnx/qlnxe/ecore_rdma_api.h   (contents, props changed)
  head/sys/dev/qlnx/qlnxe/ecore_sriov.c   (contents, props changed)
  head/sys/dev/qlnx/qlnxe/ecore_tcp_ip.h   (contents, props changed)
  head/sys/dev/qlnx/qlnxe/ecore_vf.c   (contents, props changed)
  head/sys/modules/qlnx/qlnxev/
  head/sys/modules/qlnx/qlnxev/Makefile   (contents, props changed)
Modified:
  head/sys/dev/qlnx/qlnxe/bcm_osal.h
  head/sys/dev/qlnx/qlnxe/common_hsi.h
  head/sys/dev/qlnx/qlnxe/ecore.h
  head/sys/dev/qlnx/qlnxe/ecore_chain.h
  head/sys/dev/qlnx/qlnxe/ecore_cxt.c
  head/sys/dev/qlnx/qlnxe/ecore_cxt.h
  head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c
  head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.h
  head/sys/dev/qlnx/qlnxe/ecore_dbg_values.h
  head/sys/dev/qlnx/qlnxe/ecore_dcbx.c
  head/sys/dev/qlnx/qlnxe/ecore_dcbx.h
  head/sys/dev/qlnx/qlnxe/ecore_dcbx_api.h
  head/sys/dev/qlnx/qlnxe/ecore_dev.c
  head/sys/dev/qlnx/qlnxe/ecore_dev_api.h
  head/sys/dev/qlnx/qlnxe/ecore_fcoe.h
  head/sys/dev/qlnx/qlnxe/ecore_fcoe_api.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_common.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_debug_tools.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_eth.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_fcoe.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_init_func.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_init_tool.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_iscsi.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_iwarp.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_rdma.h
  head/sys/dev/qlnx/qlnxe/ecore_hsi_roce.h
  head/sys/dev/qlnx/qlnxe/ecore_hw.c
  head/sys/dev/qlnx/qlnxe/ecore_hw.h
  head/sys/dev/qlnx/qlnxe/ecore_init_fw_funcs.c
  head/sys/dev/qlnx/qlnxe/ecore_init_fw_funcs.h
  head/sys/dev/qlnx/qlnxe/ecore_init_ops.c
  head/sys/dev/qlnx/qlnxe/ecore_init_values.h
  head/sys/dev/qlnx/qlnxe/ecore_int.c
  head/sys/dev/qlnx/qlnxe/ecore_int.h
  head/sys/dev/qlnx/qlnxe/ecore_int_api.h
  head/sys/dev/qlnx/qlnxe/ecore_iov_api.h
  head/sys/dev/qlnx/qlnxe/ecore_iro.h
  head/sys/dev/qlnx/qlnxe/ecore_iro_values.h
  head/sys/dev/qlnx/qlnxe/ecore_iscsi.h
  head/sys/dev/qlnx/qlnxe/ecore_iscsi_api.h
  head/sys/dev/qlnx/qlnxe/ecore_l2.c
  head/sys/dev/qlnx/qlnxe/ecore_l2.h
  head/sys/dev/qlnx/qlnxe/ecore_l2_api.h
  head/sys/dev/qlnx/qlnxe/ecore_ll2.h
  head/sys/dev/qlnx/qlnxe/ecore_ll2_api.h
  head/sys/dev/qlnx/qlnxe/ecore_mcp.c
  head/sys/dev/qlnx/qlnxe/ecore_mcp.h
  head/sys/dev/qlnx/qlnxe/ecore_mcp_api.h
  head/sys/dev/qlnx/qlnxe/ecore_ooo.h
  head/sys/dev/qlnx/qlnxe/ecore_proto_if.h
  head/sys/dev/qlnx/qlnxe/ecore_roce.h
  head/sys/dev/qlnx/qlnxe/ecore_roce_api.h
  head/sys/dev/qlnx/qlnxe/ecore_rt_defs.h
  head/sys/dev/qlnx/qlnxe/ecore_sp_commands.c
  head/sys/dev/qlnx/qlnxe/ecore_sp_commands.h
  head/sys/dev/qlnx/qlnxe/ecore_spq.c
  head/sys/dev/qlnx/qlnxe/ecore_spq.h
  head/sys/dev/qlnx/qlnxe/ecore_sriov.h
  head/sys/dev/qlnx/qlnxe/ecore_utils.h
  head/sys/dev/qlnx/qlnxe/ecore_vf.h
  head/sys/dev/qlnx/qlnxe/ecore_vf_api.h
  head/sys/dev/qlnx/qlnxe/ecore_vfpf_if.h
  head/sys/dev/qlnx/qlnxe/eth_common.h
  head/sys/dev/qlnx/qlnxe/fcoe_common.h
  head/sys/dev/qlnx/qlnxe/iscsi_common.h
  head/sys/dev/qlnx/qlnxe/mcp_private.h
  head/sys/dev/qlnx/qlnxe/mcp_public.h
  head/sys/dev/qlnx/qlnxe/nvm_cfg.h
  head/sys/dev/qlnx/qlnxe/nvm_map.h
  head/sys/dev/qlnx/qlnxe/qlnx_def.h
  head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
  head/sys/dev/qlnx/qlnxe/qlnx_ioctl.h
  head/sys/dev/qlnx/qlnxe/qlnx_os.c
  head/sys/dev/qlnx/qlnxe/qlnx_os.h
  head/sys/dev/qlnx/qlnxe/qlnx_ver.h
  head/sys/dev/qlnx/qlnxe/rdma_common.h
  head/sys/dev/qlnx/qlnxe/reg_addr.h
  head/sys/dev/qlnx/qlnxe/roce_common.h
  head/sys/dev/qlnx/qlnxe/spad_layout.h
  head/sys/dev/qlnx/qlnxe/storage_common.h
  head/sys/dev/qlnx/qlnxe/tcp_common.h
  head/sys/modules/qlnx/Makefile
  head/sys/modules/qlnx/qlnxe/Makefile

Modified: head/sys/dev/qlnx/qlnxe/bcm_osal.h
==
--- head/sys/dev/qlnx/qlnxe/bcm_osal.h  Wed Jul 25 01:04:50 2018
(r336694)
+++ head/sys/dev/qlnx/qlnxe/bcm_osal.h  Wed Jul 25 02:36:55 2018
(r336695)
@@ -34,7 +34,7 @@
 #include "ecore_status.h"
 #include 
 
-#if __FreeBSD_version >= 120
+#if __FreeBSD_version >= 1200032
 #include 
 #else
 #if __FreeBSD_version >= 1100090
@@ -62,6 +62,7 @@ extern void qlnx_pci_write_config_word(void *ecore_dev
 extern void qlnx_pci_write_config_dword(void *ecore_dev, uint32_t pci_reg,
 uint32_t reg_value);
 extern int ql

svn commit: r336697 - head/share/misc

2018-07-24 Thread Eitan Adler
Author: eadler
Date: Wed Jul 25 03:24:05 2018
New Revision: 336697
URL: https://svnweb.freebsd.org/changeset/base/336697

Log:
  bsd-family-tree: Announce NetBSD 8.0
  
  Obtained from:https://www.netbsd.org/releases/formal-8/

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Wed Jul 25 03:08:11 2018
(r336696)
+++ head/share/misc/bsd-family-tree Wed Jul 25 03:24:05 2018
(r336697)
@@ -372,11 +372,11 @@ FreeBSD 5.2   |  | |  
  | |  | |  |   |   |
  | |  | |  |   |   DragonFly 5.2.1
  | |  | |  |   |   |
- | |  | |  v   |   DragonFly 5.2.2
- |  FreeBSD   | |  |   |
- |   11.2 | |  |   |
- | v  | |  |   |
- || |  |   |
+ | |  | |  |   |   DragonFly 5.2.2
+ |  FreeBSD   | |  NetBSD 8.0  |   |
+ |   11.2 | |  |   |   |
+ | v  | |  |   |   |
+ || |  v   |   |
 FreeBSD 12 -current   | NetBSD -current   OpenBSD -currentDragonFly 
-current
  || |  |   |
  vv v  v   v
@@ -751,6 +751,7 @@ DragonFly 5.2.0 2018-04-10 [DFB]
 DragonFly 5.2.12018-05-20 [DFB]
 DragonFly 5.2.22018-06-18 [DFB]
 FreeBSD 11.2   2018-06-27 [FBD]
+NetBSD 8.0 2018-08-17 [NBD]
 
 Bibliography
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336698 - head/share/misc

2018-07-24 Thread Eitan Adler
Author: eadler
Date: Wed Jul 25 03:29:29 2018
New Revision: 336698
URL: https://svnweb.freebsd.org/changeset/base/336698

Log:
  bsd-family-tree: Announce NetBSD 8.0
  
  Use the correct date...

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Wed Jul 25 03:24:05 2018
(r336697)
+++ head/share/misc/bsd-family-tree Wed Jul 25 03:29:29 2018
(r336698)
@@ -751,7 +751,7 @@ DragonFly 5.2.0 2018-04-10 [DFB]
 DragonFly 5.2.12018-05-20 [DFB]
 DragonFly 5.2.22018-06-18 [DFB]
 FreeBSD 11.2   2018-06-27 [FBD]
-NetBSD 8.0 2018-08-17 [NBD]
+NetBSD 8.0 2018-07-17 [NBD]
 
 Bibliography
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r336700 - head/usr.bin/find

2018-07-24 Thread Eitan Adler
Author: eadler
Date: Wed Jul 25 03:42:07 2018
New Revision: 336700
URL: https://svnweb.freebsd.org/changeset/base/336700

Log:
  find(1): remove empty else condition
  
  reported by:  brooks

Modified:
  head/usr.bin/find/find.c
  head/usr.bin/find/misc.c

Modified: head/usr.bin/find/find.c
==
--- head/usr.bin/find/find.cWed Jul 25 03:30:01 2018(r336699)
+++ head/usr.bin/find/find.cWed Jul 25 03:42:07 2018(r336700)
@@ -34,7 +34,6 @@
 
 #if 0
 static char sccsid[] = "@(#)find.c 8.5 (Berkeley) 8/5/94";
-#else
 #endif
 
 #include 

Modified: head/usr.bin/find/misc.c
==
--- head/usr.bin/find/misc.cWed Jul 25 03:30:01 2018(r336699)
+++ head/usr.bin/find/misc.cWed Jul 25 03:42:07 2018(r336700)
@@ -34,7 +34,6 @@
 
 #if 0
 static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/1/94";
-#else
 #endif
 
 #include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"