From owner-svn-src-head@freebsd.org  Thu Jan 11 21:12:25 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15209E7CD17;
 Thu, 11 Jan 2018 21:12:25 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E58142F91;
 Thu, 11 Jan 2018 21:12:24 +0000 (UTC) (envelope-from dim@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 3B5871A65E;
 Thu, 11 Jan 2018 21:12:24 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0BLCO54035868;
 Thu, 11 Jan 2018 21:12:24 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0BLCO0T035867;
 Thu, 11 Jan 2018 21:12:24 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201801112112.w0BLCO0T035867@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 11 Jan 2018 21:12:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327845 - head/contrib/llvm/lib/Support/Unix
X-SVN-Group: head
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: head/contrib/llvm/lib/Support/Unix
X-SVN-Commit-Revision: 327845
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.25
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, 11 Jan 2018 21:12:25 -0000

Author: dim
Date: Thu Jan 11 21:12:23 2018
New Revision: 327845
URL: https://svnweb.freebsd.org/changeset/base/327845

Log:
  Pull in r316581 from upstream llvm trunk (by John Baldwin):
  
    Don't try to use a non-existent header on FreeBSD/mips.
  
    Reviewers: dim
  
    Differential Revision: https://reviews.llvm.org/D38807
  
  Requested by:	jhb
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Support/Unix/Memory.inc

Modified: head/contrib/llvm/lib/Support/Unix/Memory.inc
==============================================================================
--- head/contrib/llvm/lib/Support/Unix/Memory.inc	Thu Jan 11 20:26:17 2018	(r327844)
+++ head/contrib/llvm/lib/Support/Unix/Memory.inc	Thu Jan 11 21:12:23 2018	(r327845)
@@ -27,7 +27,7 @@
 #if defined(__mips__)
 #  if defined(__OpenBSD__)
 #    include <mips64/sysarch.h>
-#  else
+#  elif !defined(__FreeBSD__)
 #    include <sys/cachectl.h>
 #  endif
 #endif