*** 527,537 ****
                   * entries are:
                   *
                   *      AT_BASE
                   *      AT_FLAGS
                   *      AT_PAGESZ
!                  *      AT_RANDOM       (added in stk_copyout)
                   *      AT_SUN_AUXFLAGS
                   *      AT_SUN_HWCAP
                   *      AT_SUN_HWCAP2
                   *      AT_SUN_PLATFORM (added in stk_copyout)
                   *      AT_SUN_EXECNAME (added in stk_copyout)
--- 527,537 ----
                   * entries are:
                   *
                   *      AT_BASE
                   *      AT_FLAGS
                   *      AT_PAGESZ
!                  *      AT_RANDOM
                   *      AT_SUN_AUXFLAGS
                   *      AT_SUN_HWCAP
                   *      AT_SUN_HWCAP2
                   *      AT_SUN_PLATFORM (added in stk_copyout)
                   *      AT_SUN_EXECNAME (added in stk_copyout)
*** 641,652 ****
          }
  
          aux = bigwad->elfargs;
          /*
           * Move args to the user's stack.
!          * This can fill in the AT_SUN_PLATFORM, AT_SUN_EXECNAME and AT_RANDOM
!          * aux entries.
           */
          if ((error = exec_args(uap, args, idatap, (void **)&aux)) != 0) {
                  if (error == -1) {
                          error = ENOEXEC;
                          goto bad;
--- 641,651 ----
          }
  
          aux = bigwad->elfargs;
          /*
           * Move args to the user's stack.
!          * This can fill in the AT_SUN_PLATFORM and AT_SUN_EXECNAME aux entries.
           */
          if ((error = exec_args(uap, args, idatap, (void **)&aux)) != 0) {
                  if (error == -1) {
                          error = ENOEXEC;
                          goto bad;
*** 883,894 ****
  
          if (hasauxv) {
                  int auxf = AF_SUN_HWCAPVERIFY;
  
                  /*
!                  * Note: AT_SUN_PLATFORM, AT_SUN_EXECNAME and AT_RANDOM were
!                  * filled in via exec_args()
                   */
                  ADDAUX(aux, AT_BASE, voffset)
                  ADDAUX(aux, AT_FLAGS, at_flags)
                  ADDAUX(aux, AT_PAGESZ, PAGESIZE)
                  /*
--- 882,893 ----
  
          if (hasauxv) {
                  int auxf = AF_SUN_HWCAPVERIFY;
  
                  /*
!                  * Note: AT_SUN_PLATFORM and AT_RANDOM were filled in via
!                  * exec_args()
                   */
                  ADDAUX(aux, AT_BASE, voffset)
                  ADDAUX(aux, AT_FLAGS, at_flags)
                  ADDAUX(aux, AT_PAGESZ, PAGESIZE)
                  /*