Index: projects/runtime-coverage/lib/libefivar/uefi-dputil.c
===================================================================
--- projects/runtime-coverage/lib/libefivar/uefi-dputil.c	(revision 321431)
+++ projects/runtime-coverage/lib/libefivar/uefi-dputil.c	(revision 321432)
@@ -1,636 +1,636 @@
 /*-
  * Copyright (c) 2017 Netflix, Inc.
  * All rights reserved.
  *
  * 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
  *    in this position and unchanged.
  * 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 THE AUTHOR 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.
  */
 
 /*
  * Routines to format EFI_DEVICE_PATHs from the UEFI standard. Much of
  * this file is taken from EDK2 and rototilled.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <efivar.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/endian.h>
 
 #include "efi-osdep.h"
 
 #include "uefi-dplib.h"
 
-/* XXX maybe I sould include the entire DevicePathUtiltiies.c and ifdef out what we don't use */
+/* XXX maybe I should include the entire DevicePathUtiltiies.c and ifdef out what we don't use */
 
 /*
  * Taken from MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c
  * hash a11928f3310518ab1c6fd34e8d0fdbb72de9602c 2017-Mar-01
  */
 
 /** @file
   Device Path services. The thing to remember is device paths are built out of
   nodes. The device path is terminated by an end node that is length
   sizeof(EFI_DEVICE_PATH_PROTOCOL). That would be why there is sizeof(EFI_DEVICE_PATH_PROTOCOL)
   all over this file.
 
   The only place where multi-instance device paths are supported is in
   environment varibles. Multi-instance device paths should never be placed
   on a Handle.
 
   Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
   http://opensource.org/licenses/bsd-license.php.
 
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
 //
 // Template for an end-of-device path node.
 //
 static CONST EFI_DEVICE_PATH_PROTOCOL  mUefiDevicePathLibEndDevicePath = {
   END_DEVICE_PATH_TYPE,
   END_ENTIRE_DEVICE_PATH_SUBTYPE,
   {
     END_DEVICE_PATH_LENGTH,
     0
   }
 };
 
 
 /**
   Returns the size of a device path in bytes.
 
   This function returns the size, in bytes, of the device path data structure
   specified by DevicePath including the end of device path node.
   If DevicePath is NULL or invalid, then 0 is returned.
 
   @param  DevicePath  A pointer to a device path data structure.
 
   @retval 0           If DevicePath is NULL or invalid.
   @retval Others      The size of a device path in bytes.
 
 **/
 UINTN
 EFIAPI
 GetDevicePathSize (
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath
   )
 {
   CONST EFI_DEVICE_PATH_PROTOCOL  *Start;
 
   if (DevicePath == NULL) {
     return 0;
   }
 
   if (!IsDevicePathValid (DevicePath, 0)) {
     return 0;
   }
 
   //
   // Search for the end of the device path structure
   //
   Start = DevicePath;
   while (!IsDevicePathEnd (DevicePath)) {
     DevicePath = NextDevicePathNode (DevicePath);
   }
 
   //
   // Compute the size and add back in the size of the end device path structure
   //
   return ((UINTN) DevicePath - (UINTN) Start) + DevicePathNodeLength (DevicePath);
 }
 
 /**
   Determine whether a given device path is valid.
   If DevicePath is NULL, then ASSERT().
 
   @param  DevicePath  A pointer to a device path data structure.
   @param  MaxSize     The maximum size of the device path data structure.
 
   @retval TRUE        DevicePath is valid.
   @retval FALSE       The length of any node node in the DevicePath is less
                       than sizeof (EFI_DEVICE_PATH_PROTOCOL).
   @retval FALSE       If MaxSize is not zero, the size of the DevicePath
                       exceeds MaxSize.
   @retval FALSE       If PcdMaximumDevicePathNodeCount is not zero, the node
                       count of the DevicePath exceeds PcdMaximumDevicePathNodeCount.
 **/
 BOOLEAN
 EFIAPI
 IsDevicePathValid (
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
   IN       UINTN                    MaxSize
   )
 {
   UINTN Count;
   UINTN Size;
   UINTN NodeLength;
 
   ASSERT (DevicePath != NULL);
 
   if (MaxSize == 0) {
     MaxSize = MAX_UINTN;
   }
 
   //
   // Validate the input size big enough to touch the first node.
   //
   if (MaxSize < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
     return FALSE;
   }
 
   for (Count = 0, Size = 0; !IsDevicePathEnd (DevicePath); DevicePath = NextDevicePathNode (DevicePath)) {
     NodeLength = DevicePathNodeLength (DevicePath);
     if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
       return FALSE;
     }
 
     if (NodeLength > MAX_UINTN - Size) {
       return FALSE;
     }
     Size += NodeLength;
 
     //
     // Validate next node before touch it.
     //
     if (Size > MaxSize - END_DEVICE_PATH_LENGTH ) {
       return FALSE;
     }
 
     if (PcdGet32 (PcdMaximumDevicePathNodeCount) > 0) {
       Count++;
       if (Count >= PcdGet32 (PcdMaximumDevicePathNodeCount)) {
         return FALSE;
       }
     }
   }
 
   //
   // Only return TRUE when the End Device Path node is valid.
   //
   return (BOOLEAN) (DevicePathNodeLength (DevicePath) == END_DEVICE_PATH_LENGTH);
 }
 
 /**
   Returns the Type field of a device path node.
 
   Returns the Type field of the device path node specified by Node.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
   @return The Type field of the device path node specified by Node.
 
 **/
 UINT8
 EFIAPI
 DevicePathType (
   IN CONST VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   return ((const EFI_DEVICE_PATH_PROTOCOL *)(Node))->Type;
 }
 
 
 /**
   Returns the SubType field of a device path node.
 
   Returns the SubType field of the device path node specified by Node.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
   @return The SubType field of the device path node specified by Node.
 
 **/
 UINT8
 EFIAPI
 DevicePathSubType (
   IN CONST VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   return ((const EFI_DEVICE_PATH_PROTOCOL *)(Node))->SubType;
 }
 
 /**
   Returns the 16-bit Length field of a device path node.
 
   Returns the 16-bit Length field of the device path node specified by Node.
   Node is not required to be aligned on a 16-bit boundary, so it is recommended
   that a function such as ReadUnaligned16() be used to extract the contents of
   the Length field.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
   @return The 16-bit Length field of the device path node specified by Node.
 
 **/
 UINTN
 EFIAPI
 DevicePathNodeLength (
   IN CONST VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   return ((const EFI_DEVICE_PATH_PROTOCOL *)Node)->Length[0] |
       (((const EFI_DEVICE_PATH_PROTOCOL *)Node)->Length[1] << 8);
 }
 
 /**
   Returns a pointer to the next node in a device path.
 
   Returns a pointer to the device path node that follows the device path node
   specified by Node.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
   @return a pointer to the device path node that follows the device path node
   specified by Node.
 
 **/
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 NextDevicePathNode (
   IN CONST VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   return ((EFI_DEVICE_PATH_PROTOCOL *)(__DECONST(UINT8 *, Node) + DevicePathNodeLength(Node)));
 }
 
 /**
   Determines if a device path node is an end node of a device path.
   This includes nodes that are the end of a device path instance and nodes that
   are the end of an entire device path.
 
   Determines if the device path node specified by Node is an end node of a device path.
   This includes nodes that are the end of a device path instance and nodes that are the
   end of an entire device path.  If Node represents an end node of a device path,
   then TRUE is returned.  Otherwise, FALSE is returned.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
   @retval TRUE      The device path node specified by Node is an end node of a
                     device path.
   @retval FALSE     The device path node specified by Node is not an end node of
                     a device path.
 
 **/
 BOOLEAN
 EFIAPI
 IsDevicePathEndType (
   IN CONST VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   return (BOOLEAN) (DevicePathType (Node) == END_DEVICE_PATH_TYPE);
 }
 
 /**
   Determines if a device path node is an end node of an entire device path.
 
   Determines if a device path node specified by Node is an end node of an entire
   device path. If Node represents the end of an entire device path, then TRUE is
   returned.  Otherwise, FALSE is returned.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
   @retval TRUE      The device path node specified by Node is the end of an entire
                     device path.
   @retval FALSE     The device path node specified by Node is not the end of an
                     entire device path.
 
 **/
 BOOLEAN
 EFIAPI
 IsDevicePathEnd (
   IN CONST VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   return (BOOLEAN) (IsDevicePathEndType (Node) && DevicePathSubType(Node) == END_ENTIRE_DEVICE_PATH_SUBTYPE);
 }
 
 /**
   Fills in all the fields of a device path node that is the end of an entire device path.
 
   Fills in all the fields of a device path node specified by Node so Node represents
   the end of an entire device path.  The Type field of Node is set to
   END_DEVICE_PATH_TYPE, the SubType field of Node is set to
   END_ENTIRE_DEVICE_PATH_SUBTYPE, and the Length field of Node is set to
   END_DEVICE_PATH_LENGTH.  Node is not required to be aligned on a 16-bit boundary,
   so it is recommended that a function such as WriteUnaligned16() be used to set
   the contents of the Length field.
 
   If Node is NULL, then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
 
 **/
 VOID
 EFIAPI
 SetDevicePathEndNode (
   OUT VOID  *Node
   )
 {
   ASSERT (Node != NULL);
   memcpy (Node, &mUefiDevicePathLibEndDevicePath, sizeof (mUefiDevicePathLibEndDevicePath));
 }
 
 /**
   Sets the length, in bytes, of a device path node.
 
   Sets the length of the device path node specified by Node to the value specified
   by NodeLength.  NodeLength is returned.  Node is not required to be aligned on
   a 16-bit boundary, so it is recommended that a function such as WriteUnaligned16()
   be used to set the contents of the Length field.
 
   If Node is NULL, then ASSERT().
   If NodeLength >= SIZE_64KB, then ASSERT().
   If NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL), then ASSERT().
 
   @param  Node      A pointer to a device path node data structure.
   @param  Length    The length, in bytes, of the device path node.
 
   @return Length
 
 **/
 UINT16
 EFIAPI
 SetDevicePathNodeLength (
   IN OUT VOID  *Node,
   IN UINTN     Length
   )
 {
   ASSERT (Node != NULL);
   ASSERT ((Length >= sizeof (EFI_DEVICE_PATH_PROTOCOL)) && (Length < SIZE_64KB));
 //  return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(Length));
   le16enc(&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(Length));
   return Length;
 }
 
 /**
   Creates a device node.
 
   This function creates a new device node in a newly allocated buffer of size
   NodeLength and initializes the device path node header with NodeType and NodeSubType.
   The new device path node is returned.
   If NodeLength is smaller than a device path header, then NULL is returned.
   If there is not enough memory to allocate space for the new device path, then
   NULL is returned.
   The memory is allocated from EFI boot services memory. It is the responsibility
   of the caller to free the memory allocated.
 
   @param  NodeType                   The device node type for the new device node.
   @param  NodeSubType                The device node sub-type for the new device node.
   @param  NodeLength                 The length of the new device node.
 
   @return The new device path.
 
 **/
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 CreateDeviceNode (
   IN UINT8                           NodeType,
   IN UINT8                           NodeSubType,
   IN UINT16                          NodeLength
   )
 {
   EFI_DEVICE_PATH_PROTOCOL      *DevicePath;
 
   if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
     //
     // NodeLength is less than the size of the header.
     //
     return NULL;
   }
 
   DevicePath = AllocateZeroPool (NodeLength);
   if (DevicePath != NULL) {
      DevicePath->Type    = NodeType;
      DevicePath->SubType = NodeSubType;
      SetDevicePathNodeLength (DevicePath, NodeLength);
   }
 
   return DevicePath;
 }
 
 /**
   Creates a new copy of an existing device path.
 
   This function allocates space for a new copy of the device path specified by DevicePath.
   If DevicePath is NULL, then NULL is returned.  If the memory is successfully
   allocated, then the contents of DevicePath are copied to the newly allocated
   buffer, and a pointer to that buffer is returned.  Otherwise, NULL is returned.
   The memory for the new device path is allocated from EFI boot services memory.
   It is the responsibility of the caller to free the memory allocated.
 
   @param  DevicePath    A pointer to a device path data structure.
 
   @retval NULL          DevicePath is NULL or invalid.
   @retval Others        A pointer to the duplicated device path.
 
 **/
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 DuplicateDevicePath (
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath
   )
 {
   UINTN                     Size;
 
   //
   // Compute the size
   //
   Size = GetDevicePathSize (DevicePath);
   if (Size == 0) {
     return NULL;
   }
 
   //
   // Allocate space for duplicate device path
   //
 
   return AllocateCopyPool (Size, DevicePath);
 }
 
 /**
   Creates a new device path by appending a second device path to a first device path.
 
   This function creates a new device path by appending a copy of SecondDevicePath
   to a copy of FirstDevicePath in a newly allocated buffer.  Only the end-of-device-path
   device node from SecondDevicePath is retained. The newly created device path is
   returned. If FirstDevicePath is NULL, then it is ignored, and a duplicate of
   SecondDevicePath is returned.  If SecondDevicePath is NULL, then it is ignored,
   and a duplicate of FirstDevicePath is returned. If both FirstDevicePath and
   SecondDevicePath are NULL, then a copy of an end-of-device-path is returned.
 
   If there is not enough memory for the newly allocated buffer, then NULL is returned.
   The memory for the new device path is allocated from EFI boot services memory.
   It is the responsibility of the caller to free the memory allocated.
 
   @param  FirstDevicePath            A pointer to a device path data structure.
   @param  SecondDevicePath           A pointer to a device path data structure.
 
   @retval NULL      If there is not enough memory for the newly allocated buffer.
   @retval NULL      If FirstDevicePath or SecondDevicePath is invalid.
   @retval Others    A pointer to the new device path if success.
                     Or a copy an end-of-device-path if both FirstDevicePath and SecondDevicePath are NULL.
 
 **/
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePath (
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *FirstDevicePath,  OPTIONAL
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *SecondDevicePath  OPTIONAL
   )
 {
   UINTN                     Size;
   UINTN                     Size1;
   UINTN                     Size2;
   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath2;
 
   //
   // If there's only 1 path, just duplicate it.
   //
   if (FirstDevicePath == NULL) {
     return DuplicateDevicePath ((SecondDevicePath != NULL) ? SecondDevicePath : &mUefiDevicePathLibEndDevicePath);
   }
 
   if (SecondDevicePath == NULL) {
     return DuplicateDevicePath (FirstDevicePath);
   }
 
   if (!IsDevicePathValid (FirstDevicePath, 0) || !IsDevicePathValid (SecondDevicePath, 0)) {
     return NULL;
   }
 
   //
   // Allocate space for the combined device path. It only has one end node of
   // length EFI_DEVICE_PATH_PROTOCOL.
   //
   Size1         = GetDevicePathSize (FirstDevicePath);
   Size2         = GetDevicePathSize (SecondDevicePath);
   Size          = Size1 + Size2 - END_DEVICE_PATH_LENGTH;
 
   NewDevicePath = AllocatePool (Size);
 
   if (NewDevicePath != NULL) {
     NewDevicePath = CopyMem (NewDevicePath, FirstDevicePath, Size1);
     //
     // Over write FirstDevicePath EndNode and do the copy
     //
     DevicePath2 = (EFI_DEVICE_PATH_PROTOCOL *) ((CHAR8 *) NewDevicePath +
                   (Size1 - END_DEVICE_PATH_LENGTH));
     CopyMem (DevicePath2, SecondDevicePath, Size2);
   }
 
   return NewDevicePath;
 }
 
 /**
   Creates a new path by appending the device node to the device path.
 
   This function creates a new device path by appending a copy of the device node
   specified by DevicePathNode to a copy of the device path specified by DevicePath
   in an allocated buffer. The end-of-device-path device node is moved after the
   end of the appended device node.
   If DevicePathNode is NULL then a copy of DevicePath is returned.
   If DevicePath is NULL then a copy of DevicePathNode, followed by an end-of-device
   path device node is returned.
   If both DevicePathNode and DevicePath are NULL then a copy of an end-of-device-path
   device node is returned.
   If there is not enough memory to allocate space for the new device path, then
   NULL is returned.
   The memory is allocated from EFI boot services memory. It is the responsibility
   of the caller to free the memory allocated.
 
   @param  DevicePath                 A pointer to a device path data structure.
   @param  DevicePathNode             A pointer to a single device path node.
 
   @retval NULL      If there is not enough memory for the new device path.
   @retval Others    A pointer to the new device path if success.
                     A copy of DevicePathNode followed by an end-of-device-path node
                     if both FirstDevicePath and SecondDevicePath are NULL.
                     A copy of an end-of-device-path node if both FirstDevicePath
                     and SecondDevicePath are NULL.
 
 **/
 EFI_DEVICE_PATH_PROTOCOL *
 EFIAPI
 AppendDevicePathNode (
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePath,     OPTIONAL
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode  OPTIONAL
   )
 {
   EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;
   EFI_DEVICE_PATH_PROTOCOL  *NextNode;
   EFI_DEVICE_PATH_PROTOCOL  *NewDevicePath;
   UINTN                     NodeLength;
 
   if (DevicePathNode == NULL) {
     return DuplicateDevicePath ((DevicePath != NULL) ? DevicePath : &mUefiDevicePathLibEndDevicePath);
   }
   //
   // Build a Node that has a terminator on it
   //
   NodeLength = DevicePathNodeLength (DevicePathNode);
 
   TempDevicePath = AllocatePool (NodeLength + END_DEVICE_PATH_LENGTH);
   if (TempDevicePath == NULL) {
     return NULL;
   }
   TempDevicePath = CopyMem (TempDevicePath, DevicePathNode, NodeLength);
   //
   // Add and end device path node to convert Node to device path
   //
   NextNode = NextDevicePathNode (TempDevicePath);
   SetDevicePathEndNode (NextNode);
   //
   // Append device paths
   //
   NewDevicePath = AppendDevicePath (DevicePath, TempDevicePath);
 
   FreePool (TempDevicePath);
 
   return NewDevicePath;
 }
Index: projects/runtime-coverage/share/mk/bsd.obj.mk
===================================================================
--- projects/runtime-coverage/share/mk/bsd.obj.mk	(revision 321431)
+++ projects/runtime-coverage/share/mk/bsd.obj.mk	(revision 321432)
@@ -1,236 +1,237 @@
 # $FreeBSD$
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
 #
 # +++ variables +++
 #
 # CLEANDIRS	Additional directories to remove for the clean target.
 #
 # CLEANFILES	Additional files to remove for the clean target.
 #
 # MAKEOBJDIR 	A pathname for the directory where the targets
 #		are built.  Note: MAKEOBJDIR is an *environment* variable
 #		and works properly only if set as an environment variable,
 #		not as a global or command line variable!
 #
 #		E.g. use `env MAKEOBJDIR=temp-obj make'
 #
 # MAKEOBJDIRPREFIX  Specifies somewhere other than /usr/obj to root the object
 #		tree.  Note: MAKEOBJDIRPREFIX is an *environment* variable
 #		and works properly only if set as an environment variable,
 #		not as a global or command line variable!
 #
 #		E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make'
 #
 # NO_OBJ	Do not create object directories.  This should not be set
 #		if anything is built.
 #
 # +++ targets +++
 #
 #	clean:
 #		remove ${CLEANFILES}; remove ${CLEANDIRS} and all contents.
 #
 #	cleandir:
 #		remove the build directory (and all its contents) created by obj
 #
 #	obj:
 #		create build directory.
 #
 
 .if !target(__<bsd.obj.mk>__)
 __<bsd.obj.mk>__:
 .include <bsd.own.mk>
 
 .if ${MK_AUTO_OBJ} == "yes"
 # it is done by now
 objwarn:
 obj:
 CANONICALOBJDIR= ${.OBJDIR}
 .if defined(NO_OBJ)
 # but this makefile does not want it!
 .OBJDIR: ${.CURDIR}
 .endif
 # Handle special case where SRCS is full-pathed and requires
 # nested objdirs.  This duplicates some auto.obj.mk logic.
 .if (!empty(SRCS:M*/*) || !empty(DPSRCS:M*/*)) && \
     (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "")
 _wantdirs=	${SRCS:M*/*:H} ${DPSRCS:M*/*:H}
 .if !empty(_wantdirs)
 _wantdirs:=	${_wantdirs:O:u}
 _needdirs=
 .for _dir in ${_wantdirs}
 .if !exists(${.OBJDIR}/${_dir}/)
 _needdirs+=	${_dir}
 .endif
 .endfor
 .endif
 .if !empty(_needdirs)
 #_mkneededdirs!=	umask ${OBJDIR_UMASK:U002}; ${Mkdirs} ${_needdirs}
 __objdir_made != umask ${OBJDIR_UMASK:U002}; ${Mkdirs}; \
 	for dir in ${_needdirs}; do \
 	  dir=${.OBJDIR}/$${dir}; \
 	  ${ECHO_TRACE} "[Creating nested objdir $${dir}...]" >&2; \
           Mkdirs $${dir}; \
 	done
 .endif
 .endif	# !empty(SRCS:M*/*) || !empty(DPSRCS:M*/*)
 .elif defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
 OBJTOP?= ${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
 OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
 
 #
 # Warn of unorthodox object directory.
 #
 # The following directories are tried in order for ${.OBJDIR}:
 #
 # 1.  ${MAKEOBJDIRPREFIX}/`pwd`
 # 2.  ${MAKEOBJDIR}
 # 3.  obj.${MACHINE}
 # 4.  obj
 # 5.  /usr/obj/`pwd`
 # 6.  ${.CURDIR}
 #
 # If ${.OBJDIR} is constructed using canonical cases 1 or 5, or
 # case 2 (using MAKEOBJDIR), don't issue a warning.  Otherwise,
 # issue a warning differentiating between cases 6 and (3 or 4).
 #
 objwarn: .PHONY
 .if !defined(NO_OBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \
     !(defined(MAKEOBJDIRPREFIX) && exists(${CANONICALOBJDIR}/)) && \
     !(defined(MAKEOBJDIR) && exists(${MAKEOBJDIR}/))
 .if ${.OBJDIR} == ${.CURDIR}
 	@${ECHO} "Warning: Object directory not changed from original ${.CURDIR}"
 .elif exists(${.CURDIR}/obj.${MACHINE}/) || exists(${.CURDIR}/obj/)
 	@${ECHO} "Warning: Using ${.OBJDIR} as object directory instead of\
 		canonical ${CANONICALOBJDIR}"
 .endif
 .endif
 beforebuild: objwarn
 
 .if !defined(NO_OBJ)
 .if !target(obj)
 obj: .PHONY
 	@if ! test -d ${CANONICALOBJDIR}/; then \
 		mkdir -p ${CANONICALOBJDIR}; \
 		if ! test -d ${CANONICALOBJDIR}/; then \
 			${ECHO} "Unable to create ${CANONICALOBJDIR}."; \
 			exit 1; \
 		fi; \
 		${ECHO} "${CANONICALOBJDIR} created for ${.CURDIR}"; \
 	fi
 .for dir in ${SRCS:H:O:u} ${DPSRCS:H:O:u}
 	@if ! test -d ${CANONICALOBJDIR}/${dir}/; then \
 		mkdir -p ${CANONICALOBJDIR}/${dir}; \
 		if ! test -d ${CANONICALOBJDIR}/${dir}/; then \
 			${ECHO} "Unable to create ${CANONICALOBJDIR}/${dir}."; \
 			exit 1; \
 		fi; \
 		${ECHO} "${CANONICALOBJDIR}/${dir} created for ${.CURDIR}"; \
 	fi
 .endfor
 .endif
 
 .if !target(objlink)
 objlink:
 	@if test -d ${CANONICALOBJDIR}/; then \
 		rm -f ${.CURDIR}/obj; \
 		ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
 	else \
 		echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \
 	fi
 .endif
 .endif # !defined(NO_OBJ)
 
 #
 # where would that obj directory be?
 #
 .if !target(whereobj)
 whereobj:
 	@echo ${.OBJDIR}
 .endif
 
+# Same check in bsd.progs.mk
 .if ${CANONICALOBJDIR} != ${.CURDIR} && exists(${CANONICALOBJDIR}/)
 cleanobj:
-	@-rm -rf ${CANONICALOBJDIR}
+	-rm -rf ${CANONICALOBJDIR}
 .else
 cleanobj: clean cleandepend
 .endif
 	@if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
 
 # Tell bmake not to look for generated files via .PATH
 NOPATH_FILES+=	${CLEANFILES}
 .if !empty(NOPATH_FILES)
 .NOPATH: ${NOPATH_FILES}
 .endif
 
 .if !target(clean)
 clean:
 .if defined(CLEANFILES) && !empty(CLEANFILES)
 	rm -f ${CLEANFILES}
 .endif
 .if defined(CLEANDIRS) && !empty(CLEANDIRS)
 	-rm -rf ${CLEANDIRS}
 .endif
 .endif
 .ORDER: clean all
 
 cleandir: cleanobj
 
 .include <bsd.subdir.mk>
 
 .if make(destroy*) && defined(OBJROOT)
 # this (rm -rf objdir) is much faster and more reliable than cleaning.
 
 # just in case we are playing games with these...
 _OBJDIR?= ${.OBJDIR}
 _CURDIR?= ${.CURDIR}
 
 # destroy almost everything
 destroy: destroy-all
 destroy-all:
 
 # just remove our objdir
 destroy-arch: .NOMETA
 .if ${_OBJDIR} != ${_CURDIR}
 	cd ${_CURDIR} && rm -rf ${_OBJDIR}
 .endif
 
 .if defined(HOST_OBJTOP)
 destroy-host: destroy.host
 destroy.host: .NOMETA
 	cd ${_CURDIR} && rm -rf ${HOST_OBJTOP}/${RELDIR:N.}
 .endif
 
 .if make(destroy-all) && ${RELDIR} == "."
 destroy-all: destroy-stage
 .endif
 
 # remove the stage tree
 destroy-stage: .NOMETA
 .if defined(STAGE_ROOT)
 	cd ${_CURDIR} && rm -rf ${STAGE_ROOT}
 .endif
 
 # allow parallel destruction
 _destroy_machine_list = common host ${ALL_MACHINE_LIST}
 .for m in ${_destroy_machine_list:O:u}
 destroy-all: destroy.$m
 .if !target(destroy.$m)
 destroy.$m: .NOMETA
 .if ${_OBJDIR} != ${_CURDIR}
 	cd ${_CURDIR} && rm -rf ${OBJROOT}$m*/${RELDIR:N.}
 .endif
 .endif
 .endfor
 
 .endif
 
 .endif # !target(__<bsd.obj.mk>__)
Index: projects/runtime-coverage/share/mk/bsd.opts.mk
===================================================================
--- projects/runtime-coverage/share/mk/bsd.opts.mk	(revision 321431)
+++ projects/runtime-coverage/share/mk/bsd.opts.mk	(revision 321432)
@@ -1,112 +1,109 @@
 # $FreeBSD$
 #
 # Option file for src builds.
 #
 # Users define WITH_FOO and WITHOUT_FOO on the command line or in /etc/src.conf
 # and /etc/make.conf files. These translate in the build system to MK_FOO={yes,no}
 # with sensible (usually) defaults.
 #
 # Makefiles must include bsd.opts.mk after defining specific MK_FOO options that
 # are applicable for that Makefile (typically there are none, but sometimes there
 # are exceptions). Recursive makes usually add MK_FOO=no for options that they wish
 # to omit from that make.
 #
 # Makefiles must include bsd.mkopt.mk before they test the value of any MK_FOO
 # variable.
 #
 # Makefiles may also assume that this file is included by bsd.own.mk should it
 # need variables defined there prior to the end of the Makefile where
 # bsd.{subdir,lib.bin}.mk is traditionally included.
 #
 # The old-style YES_FOO and NO_FOO are being phased out. No new instances of them
 # should be added. Old instances should be removed since they were just to
 # bridge the gap between FreeBSD 4 and FreeBSD 5.
 #
 # Makefiles should never test WITH_FOO or WITHOUT_FOO directly (although an
 # exception is made for _WITHOUT_SRCONF which turns off this mechanism
 # completely).
 #
 
 .if !target(__<bsd.opts.mk>__)
 __<bsd.opts.mk>__:
 
 .if !defined(_WITHOUT_SRCCONF)
 #
 # Define MK_* variables (which are either "yes" or "no") for users
 # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
 # make(1) environment.
 # These should be tested with `== "no"' or `!= "no"' in makefiles.
 # The NO_* variables should only be set by makefiles for variables
 # that haven't been converted over.
 #
 
 # Only these options are used by bsd.*.mk. KERBEROS and OPENSSH are
 # unforutnately needed to support statically linking the entire
 # tree. su(1) wouldn't link since it depends on PAM which depends on
 # ssh libraries when building with OPENSSH, and likewise for KERBEROS.
 
 # All other variables used to build /usr/src live in src.opts.mk
 # and variables from both files are documented in src.conf(5).
 
 __DEFAULT_YES_OPTIONS = \
     ASSERT_DEBUG \
     DEBUG_FILES \
     DOCCOMPRESS \
     INCLUDES \
     INSTALLLIB \
     KERBEROS \
     MAN \
     MANCOMPRESS \
     NIS \
     NLS \
     OPENSSH \
     PROFILE \
     SSP \
     SYMVER \
     TOOLCHAIN \
     WARNS
 
 __DEFAULT_NO_OPTIONS = \
     CCACHE_BUILD \
     COVERAGE \
     CTF \
     INSTALL_AS_USER \
     STALE_STAGED
 
 # meta mode related
 __DEFAULT_DEPENDENT_OPTIONS = \
     COVERAGE/DEBUG_FILES \
     STAGING_MAN/STAGING \
     STAGING_PROG/STAGING \
+    STALE_STAGED/STAGING \
 
 
 .include <bsd.mkopt.mk>
 
 #
 # Supported NO_* options (if defined, MK_* will be forced to "no",
 # regardless of user's setting).
 #
 # These are transitional and will disappaer in the FreeBSD 12.
 #
 .for var in \
     CTF \
     DEBUG_FILES \
     INSTALLLIB \
     MAN \
     PROFILE \
     WARNS
 .if defined(NO_${var})
 .warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
 MK_${var}:=no
 .endif
 .endfor
-
-.if ${MK_STAGING} == "no"
-MK_STALE_STAGED= no
-.endif
 
 .include <bsd.cpu.mk>
 
 .endif # !_WITHOUT_SRCCONF
 
 .endif
Index: projects/runtime-coverage/share/mk/bsd.progs.mk
===================================================================
--- projects/runtime-coverage/share/mk/bsd.progs.mk	(revision 321431)
+++ projects/runtime-coverage/share/mk/bsd.progs.mk	(revision 321432)
@@ -1,155 +1,164 @@
 # $FreeBSD$
 # $Id: progs.mk,v 1.11 2012/11/06 17:18:54 sjg Exp $
 #
 #	@(#) Copyright (c) 2006, Simon J. Gerraty
 #
 #	This file is provided in the hope that it will
 #	be of use.  There is absolutely NO WARRANTY.
 #	Permission to copy, redistribute or otherwise
 #	use this file is hereby granted provided that 
 #	the above copyright notice and this notice are
 #	left intact. 
 #      
 #	Please send copies of changes and bug-fixes to:
 #	sjg@crufty.net
 #
 
 .MAIN: all
 
 .if defined(PROGS) || defined(PROGS_CXX)
 # we really only use PROGS below...
 PROGS += ${PROGS_CXX}
 
 .if defined(PROG)
 # just one of many
 PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
 			PROGNAME SRCS STRIP WARNS
 PROG_VARS +=	CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \
 		LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
 .if empty(${PROG_OVERRIDE_VARS:M$v})
 .if defined(${v}.${PROG})
 $v += ${${v}.${PROG}}
 .elif defined(${v}_${PROG})
 $v += ${${v}_${PROG}}
 .endif
 .else
 $v ?=
 .endif
 .endfor
 
 .if ${MK_DIRDEPS_BUILD} == "yes"
 # Leave updating the Makefile.depend to the parent.
 UPDATE_DEPENDFILE = NO
 
 # Record our meta files for the parent to use.
 CLEANFILES+= ${PROG}.meta_files
 ${PROG}.meta_files: .NOMETA $${.MAKE.META.CREATED} ${_this}
 	@echo "Updating ${.TARGET}: ${.OODATE:T:[1..8]}"
 	@echo ${.MAKE.META.FILES} > ${.TARGET}
 
 .if !defined(_SKIP_BUILD)
 .END: ${PROG}.meta_files
 .endif
 .endif	# ${MK_DIRDEPS_BUILD} == "yes"
 
 # prog.mk will do the rest
 .else # !defined(PROG)
 .if !defined(_SKIP_BUILD)
 all: ${PROGS}
 .endif
 
 META_XTRAS+=	${cat ${PROGS:S/$/*.meta_files/} 2>/dev/null || true:L:sh}
 
 .if ${MK_STAGING} != "no" && !empty(PROGS)
 # Stage from parent while respecting PROGNAME and BINDIR overrides.
 .for _prog in ${PROGS}
 STAGE_DIR.prog.${_prog}= ${STAGE_OBJTOP}${BINDIR.${_prog}:UBINDIR_${_prog}:U${BINDIR}}
 STAGE_AS_SETS+=	prog.${_prog}
 STAGE_AS_prog.${_prog}=	${PROGNAME.${_prog}:UPROGNAME_${_prog}:U${_prog}}
 stage_as.prog.${_prog}: ${_prog}
 .endfor
 .endif	# ${MK_STAGING} != "no" && !empty(PROGS)
 .endif
 .endif	# PROGS || PROGS_CXX
 
 # These are handled by the main make process.
 .ifdef _RECURSING_PROGS
 MK_STAGING= no
 
 _PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS CONFGROUPS FILESGROUPS INCSGROUPS \
 		    SCRIPTS
 .for v in ${_PROGS_GLOBAL_VARS}
 $v =
 .endfor
 .endif
 
 # handle being called [bsd.]progs.mk
 .include <bsd.prog.mk>
 
 # Find common sources among the PROGS to depend on them before building
 # anything.  This allows parallelization without them each fighting over
 # the same objects.
 _PROGS_COMMON_SRCS=
 _PROGS_ALL_SRCS=
 .for p in ${PROGS}
 .for s in ${SRCS.${p}}
 .if ${_PROGS_ALL_SRCS:M${s}} && !${_PROGS_COMMON_SRCS:M${s}}
 _PROGS_COMMON_SRCS+=	${s}
 .else
 _PROGS_ALL_SRCS+=	${s}
 .endif
 .endfor
 .endfor
 .if !empty(_PROGS_COMMON_SRCS)
 _PROGS_COMMON_OBJS=	${_PROGS_COMMON_SRCS:M*.[dhly]}
 .if !empty(_PROGS_COMMON_SRCS:N*.[dhly])
 _PROGS_COMMON_OBJS+=	${_PROGS_COMMON_SRCS:N*.[dhly]:R:S/$/.o/g}
 .endif
 .endif
 
 # When recursing, ensure common sources are not rebuilt in META_MODE.
 .if defined(_RECURSING_PROGS) && !empty(_PROGS_COMMON_OBJS) && \
     !empty(.MAKE.MODE:Mmeta)
 ${_PROGS_COMMON_OBJS}: .NOMETA
 .endif
 
 .if !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
 # tell progs.mk we might want to install things
-PROGS_TARGETS+= checkdpadd clean cleandepend cleandir depend install
+PROGS_TARGETS+= checkdpadd clean depend install
+# Only handle removing depend files from the main process.
+_PROG_MK.cleandir=	CLEANDEPENDFILES= CLEANDEPENDDIRS=
+_PROG_MK.cleanobj=	CLEANDEPENDFILES= CLEANDEPENDDIRS=
+# Only recurse on these if there is no objdir, meaning a normal
+# 'clean' gets ran via the target defined in bsd.obj.mk.
+# Same check from cleanobj: in bsd.obj.mk
+.if ${CANONICALOBJDIR} == ${.CURDIR} || !exists(${CANONICALOBJDIR}/)
+PROGS_TARGETS+=	cleandir cleanobj
+.endif
 
 # Ensure common objects are built before recursing.
 .if !empty(_PROGS_COMMON_OBJS)
 ${PROGS}: ${_PROGS_COMMON_OBJS}
 .endif
 
 .for p in ${PROGS}
 .if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
 # bsd.prog.mk may need to know this
 x.$p= PROG_CXX=$p
 .endif
 
 # Main PROG target
 $p ${p}_p: .PHONY .MAKE
 	(cd ${.CURDIR} && \
 	    DEPENDFILE=.depend.$p \
 	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \
 	    PROG=$p ${x.$p})
 
 # Pseudo targets for PROG, such as 'install'.
 .for t in ${PROGS_TARGETS:O:u}
 $p.$t: .PHONY .MAKE
 	(cd ${.CURDIR} && \
 	    DEPENDFILE=.depend.$p \
 	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \
-	    PROG=$p ${x.$p} ${@:E})
+	    ${_PROG_MK.${t}} PROG=$p ${x.$p} ${@:E})
 .endfor
 .endfor
 
 # Depend main pseudo targets on all PROG.pseudo targets too.
 .for t in ${PROGS_TARGETS:O:u}
 .if make(${t})
 $t: ${PROGS:%=%.$t}
 .endif
 .endfor
 .endif	# !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
Index: projects/runtime-coverage
===================================================================
--- projects/runtime-coverage	(revision 321431)
+++ projects/runtime-coverage	(revision 321432)

Property changes on: projects/runtime-coverage
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r321426-321431