svn commit: r206498 - in projects/clangbsd: . contrib/llvm/tools/clang/lib/Frontend etc/mtree gnu/usr.bin/cc/include usr.bin/clang/include

[Roman Divacky]

Author: rdivacky
Date: Mon Apr 12 16:51:29 2010
New Revision: 206498
URL: http://svn.freebsd.org/changeset/base/206498

Log:
  Revert r204959 with changes. Bump header namespace from 1.0 to 1.5
  chasing upstream. Make clang search /usr/include/clang/1.5 before
  other header paths. And finally add -isystem ${WORLDTMP}/usr/include/clang/1.5
  to compiler invocation when CC/CXX is clang/clang++. This is necessary
  because clang build uses mmintrin headers which differs between gcc/clang
  and clang can't grok gcc ones and gcc can't grok clang ones.

Modified:
  projects/clangbsd/Makefile.inc1
  projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
  projects/clangbsd/etc/mtree/BSD.include.dist
  projects/clangbsd/gnu/usr.bin/cc/include/Makefile
  projects/clangbsd/usr.bin/clang/include/Makefile

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Mon Apr 12 16:37:45 2010	(r206497)
+++ projects/clangbsd/Makefile.inc1	Mon Apr 12 16:51:29 2010	(r206498)
@@ -252,14 +252,18 @@ XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_GDB
 
+.if ${CC} == "clang" || ${CXX} == "clang++"
+MMINTRIN_CLANG=	-isystem ${WORLDTMP}/usr/include/clang/1.5
+.endif
+
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="${CC} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP}/usr/bin/ -L${WORLDTMP}/usr/lib/" \
-		CXX="${CXX} -isystem ${WORLDTMP}/usr/include -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP}/usr/bin/ -L${WORLDTMP}/usr/lib/"
+		CC="${CC} ${MMINTRIN_CLANG} -isystem ${WORLDTMP}/usr/include -B${WORLDTMP}/usr/bin/ -L${WORLDTMP}/usr/lib/" \
+		CXX="${CXX} ${MMINTRIN_CLANG} -isystem ${WORLDTMP}/usr/include -isystem ${WORLDTMP}/include/c++/4.2 -isystem ${WORLDTMP}/include/c++/4.2/backward -B${WORLDTMP}/usr/bin/ -L${WORLDTMP}/usr/lib/"
 
 .if ${MK_CDDL} == "no" || defined(NO_CTF)
 WMAKEENV+=	NO_CTF=1

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Mon Apr 12 16:37:45 2010	(r206497)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp	Mon Apr 12 16:51:29 2010	(r206498)
@@ -433,6 +433,8 @@ void InitHeaderSearch::AddDefaultCInclud
   case llvm::Triple::MinGW32:
     AddPath("c:/mingw/include", System, true, false, false);
     break;
+  case llvm::Triple::FreeBSD:
+    AddPath("/usr/include/clang/1.5", System, true, false, false);
   default:
     break;
   }

Modified: projects/clangbsd/etc/mtree/BSD.include.dist
==============================================================================
--- projects/clangbsd/etc/mtree/BSD.include.dist	Mon Apr 12 16:37:45 2010	(r206497)
+++ projects/clangbsd/etc/mtree/BSD.include.dist	Mon Apr 12 16:51:29 2010	(r206498)
@@ -84,7 +84,7 @@
         ..
     ..
     clang
-        1.0
+        1.5
         ..
     ..
     crypto

Modified: projects/clangbsd/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- projects/clangbsd/gnu/usr.bin/cc/include/Makefile	Mon Apr 12 16:37:45 2010	(r206497)
+++ projects/clangbsd/gnu/usr.bin/cc/include/Makefile	Mon Apr 12 16:51:29 2010	(r206498)
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
-.include <bsd.own.mk>
 
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
-.if ${MK_CLANG_IS_CC} == "no"
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h mm_malloc.h
 .elif ${TARGET_ARCH} == "ia64"
@@ -15,7 +13,6 @@ INCS=	mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc"
 INCS=	ppc-asm.h altivec.h spe.h
 .endif
-.endif
 
 mm_malloc.h: pmm_malloc.h
 	@rm -rf ${.TARGET}

Modified: projects/clangbsd/usr.bin/clang/include/Makefile
==============================================================================
--- projects/clangbsd/usr.bin/clang/include/Makefile	Mon Apr 12 16:37:45 2010	(r206497)
+++ projects/clangbsd/usr.bin/clang/include/Makefile	Mon Apr 12 16:51:29 2010	(r206498)
@@ -2,11 +2,9 @@
 
 .PATH: ${.CURDIR}/../../../contrib/llvm/tools/clang/lib/Headers
 
-.include <bsd.own.mk>
+INCSDIR=${INCLUDEDIR}/clang/1.5
 
-.if ${MK_CLANG_IS_CC} != "no"
 INCS=	emmintrin.h mm_malloc.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h
-.endif
 
 .include <bsd.init.mk>
 .include <bsd.incs.mk>