From owner-svn-src-projects@freebsd.org  Tue May  9 20:07:35 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 C5136D64B04
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue,  9 May 2017 20:07:35 +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 mx1.freebsd.org (Postfix) with ESMTPS id 97413BBF;
 Tue,  9 May 2017 20:07:35 +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 v49K7YQO026734;
 Tue, 9 May 2017 20:07:34 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v49K7YZc026733;
 Tue, 9 May 2017 20:07:34 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201705092007.v49K7YZc026733@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: Tue, 9 May 2017 20:07:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r318103 - projects/clang500-import/lib/clang/headers
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 May 2017 20:07:35 -0000

Author: dim
Date: Tue May  9 20:07:34 2017
New Revision: 318103
URL: https://svnweb.freebsd.org/changeset/base/318103

Log:
  Add new LWP intrinsics header, and an option to install internal clang
  headers which have the same name as our system headers, and might
  conflict with them.  (It is a work in progress to make these fully
  compatible.)

Modified:
  projects/clang500-import/lib/clang/headers/Makefile

Modified: projects/clang500-import/lib/clang/headers/Makefile
==============================================================================
--- projects/clang500-import/lib/clang/headers/Makefile	Tue May  9 19:54:33 2017	(r318102)
+++ projects/clang500-import/lib/clang/headers/Makefile	Tue May  9 20:07:34 2017	(r318103)
@@ -52,6 +52,7 @@ INCS+=		htmintrin.h
 INCS+=		htmxlintrin.h
 INCS+=		ia32intrin.h
 INCS+=		immintrin.h
+INCS+=		lwpintrin.h
 INCS+=		lzcntintrin.h
 INCS+=		mm3dnow.h
 INCS+=		mm_malloc.h
@@ -85,6 +86,25 @@ INCS+=		xsavesintrin.h
 INCS+=		xtestintrin.h
 INCS+=		${GENINCS}
 
+# Headers which possibly conflict with our own versions:
+.if defined(INSTALL_CONFLICTING_CLANG_HEADERS)
+INCS+=		float.h
+INCS+=		intrin.h
+INCS+=		inttypes.h
+INCS+=		iso646.h
+INCS+=		limits.h
+INCS+=		stdalign.h
+INCS+=		stdarg.h
+INCS+=		stdatomic.h
+INCS+=		stdbool.h
+INCS+=		stddef.h
+INCS+=		stdint.h
+INCS+=		stdnoreturn.h
+INCS+=		tgmath.h
+INCS+=		unwind.h
+INCS+=		varargs.h
+.endif
+
 arm_neon.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
 	${CLANG_TBLGEN} -gen-arm-neon \
 	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \