From owner-svn-src-head@freebsd.org  Thu May  7 21:18:38 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 542592E5F42;
 Thu,  7 May 2020 21:18:38 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49J5t61YMJz3HXx;
 Thu,  7 May 2020 21:18:38 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3063C1F657;
 Thu,  7 May 2020 21:18:38 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 047LIcAL095129;
 Thu, 7 May 2020 21:18:38 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 047LIcZ7095128;
 Thu, 7 May 2020 21:18:38 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <202005072118.047LIcZ7095128@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 7 May 2020 21:18:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360801 - head/contrib/llvm-project/llvm/lib/Support/Unix
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head/contrib/llvm-project/llvm/lib/Support/Unix
X-SVN-Commit-Revision: 360801
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.30
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2020 21:18:38 -0000

Author: emaste
Date: Thu May  7 21:18:37 2020
New Revision: 360801
URL: https://svnweb.freebsd.org/changeset/base/360801

Log:
  Merge commit 21e5e1724b75 from llvm git:
  
    getMainExecutable: Fix hand-rolled AT_EXECPATH for older FreeBSD
  
    Once we hit AT_NULL, we need to bail out of the loop; not just the
    enclosing switch.  This fixes basic usage (e.g. `cc --version`) when
    AT_EXECPATH isn't present on older branches (e.g. under
    emu-user-static, at the moment), where we would previously run off
    the end of ::environ.
  
    Patch By: kevans
  
    Reviewed By: arichardson
  
    Differential Revision:  https://reviews.llvm.org/D79239
  
  MFC after:	3 days

Modified:
  head/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc

Modified: head/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc
==============================================================================
--- head/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc	Thu May  7 21:14:12 2020	(r360800)
+++ head/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc	Thu May  7 21:18:37 2020	(r360801)
@@ -208,14 +208,9 @@ std::string getMainExecutable(const char *argv0, void 
   while (*p++ != 0)
     ;
   // Iterate through auxiliary vectors for AT_EXECPATH.
-  for (;;) {
-    switch (*(uintptr_t *)p++) {
-    case AT_EXECPATH:
+  for (; *(uintptr_t *)p != AT_NULL; p++) {
+    if (*(uintptr_t *)p++ == AT_EXECPATH)
       return *p;
-    case AT_NULL:
-      break;
-    }
-    p++;
   }
 #endif
   // Fall back to argv[0] if auxiliary vectors are not available.