Update clang-devel and llvm-devel to r236894.

Add a port of the Intel/LLVM OpenMP runtime library.

Sponsored by:	DARPA, AFRL

9 files changed, 92 insertions, 5 deletions

diff --git a/devel/Makefile b/devel/Makefile
index b6d73106132e..1c3cec694f1d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1078,6 +1078,7 @@
     SUBDIR += libical
     SUBDIR += libical-glib
     SUBDIR += libinotify
+    SUBDIR += libiomp5
     SUBDIR += libiqxmlrpc
     SUBDIR += libisofs
     SUBDIR += libixp
diff --git a/devel/libiomp5-devel/Makefile b/devel/libiomp5-devel/Makefile
new file mode 100644
index 000000000000..91ce0ab06bff
--- /dev/null
+++ b/devel/libiomp5-devel/Makefile
@@ -0,0 +1,58 @@
+# Created by: Brooks Davis
+# $FreeBSD$
+
+PORTNAME=	libiomp5
+PORTVERSION=	3.7.r${SVN_REV}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	brooks
+PKGNAMESUFFIX=	-devel
+DISTNAME=	openmp-${PORTVERSION}
+
+MAINTAINER=	brooks@FreeBSD.org
+COMMENT=	Intel/LLVM OpenMP runtime
+
+BUILD_DEPENDS+=	llvm-config${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+
+LLVM_SUFFIX=	-devel
+LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
+#DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+#DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
+CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
+CMAKE_ARGS=	-Darch=${OPENMP_ARCH}
+
+USES=		cmake ninja tar:xz
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/runtime
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+OPENMP_ARCH=	32
+.elif ${ARCH} == "amd64"
+OPENMP_ARCH=	32e
+.elif ${ARCH} == "powerpc64"
+OPENMP_ARCH=	ppc64
+.elif ${ARCH} == "arm" || ${ARCH} == "aarch64"
+OPENMP_ARCH=	${ARCH}
+.else
+BROKEN=		Only builds on amd64, arm, aarch64, powerpc64, and i386.
+.endif
+
+.include "${.CURDIR}/../../devel/llvm-devel/Makefile.svn_rev"
+
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
+FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+
+do-fetch:
+	${MKDIR} ${WRKDIR}
+	svn export -r ${SVN_REV} \
+	    http://llvm.org/svn/llvm-project/openmp/trunk ${WRKDIR}/${DISTNAME}
+	cd ${WRKDIR}; tar cvfJ ${DISTDIR}/${DISTNAME}.tar.xz ${DISTNAME}
+.if ${USER} == brooks || ${USER} == bed22
+	scp ${DISTDIR}/${DISTNAME}.tar.xz \
+	    brooks@freefall.freebsd.org:public_distfiles/
+.endif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/libiomp5-devel/distinfo b/devel/libiomp5-devel/distinfo
new file mode 100644
index 000000000000..4ab4b84e384c
--- /dev/null
+++ b/devel/libiomp5-devel/distinfo
@@ -0,0 +1,2 @@
+SHA256 (openmp-3.7.r236894.tar.xz) = ff065e18825cfb81e76d3b4561422baa422daa219f55b4c59478f3c64b799ffb
+SIZE (openmp-3.7.r236894.tar.xz) = 2029516
diff --git a/devel/libiomp5-devel/files/patch-src_kmp__ftn__entry.h b/devel/libiomp5-devel/files/patch-src_kmp__ftn__entry.h
new file mode 100644
index 000000000000..96b34ce08afc
--- /dev/null
+++ b/devel/libiomp5-devel/files/patch-src_kmp__ftn__entry.h
@@ -0,0 +1,14 @@
+--- src/kmp_ftn_entry.h.orig	2015-05-08 20:49:21 UTC
++++ src/kmp_ftn_entry.h
+@@ -768,9 +768,9 @@ FTN_GET_NUM_DEVICES( void )
+     return 0;
+ }
+ 
+-#endif // KMP_MIC || KMP_OS_DARWIN
++#endif // KMP_MIC || KMP_OS_DARWIN 
+ 
+-#if ! KMP_OS_LINUX
++#if ! KMP_OS_LINUX && ! KMP_OS_FREEBSD
+ 
+ int FTN_STDCALL
+ FTN_IS_INITIAL_DEVICE( void )
diff --git a/devel/libiomp5-devel/pkg-descr b/devel/libiomp5-devel/pkg-descr
new file mode 100644
index 000000000000..4e403a9533b2
--- /dev/null
+++ b/devel/libiomp5-devel/pkg-descr
@@ -0,0 +1,5 @@
+The Intel OpenMP* runtime is the part of the OpenMP*
+implementation that your code is linked against, and that manages the
+multiple threads in an OpenMP* program while it is executing.
+
+WWW: http://openmp.llvm.org
diff --git a/devel/libiomp5-devel/pkg-plist b/devel/libiomp5-devel/pkg-plist
new file mode 100644
index 000000000000..119908933c5a
--- /dev/null
+++ b/devel/libiomp5-devel/pkg-plist
@@ -0,0 +1,3 @@
+llvm-devel/include/iomp.h
+llvm-devel/include/omp.h
+llvm-devel/lib/libiomp5.so
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index 9beaf48cf231..09538758142a 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	234164
+SVN_REV=	236894
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 878996641757..60940687c6e0 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.7.r234164.tar.bz2) = aadef776f14c7b43d6caf661ac1b19da5b7b3c25f6422282a14091ee9e8fb1da
-SIZE (llvm-3.7.r234164.tar.bz2) = 15311690
+SHA256 (llvm-3.7.r236894.tar.bz2) = 58c4a60f54606e8cc29ac7d5ca02e6b64a016b576defd46984415a681033b00f
+SIZE (llvm-3.7.r236894.tar.bz2) = 16093028
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index d0513634bfe4..8bafcfe0e16e 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -172,6 +172,7 @@ llvm-devel/include/llvm/Analysis/InstructionSimplify.h
 llvm-devel/include/llvm/Analysis/Interval.h
 llvm-devel/include/llvm/Analysis/IntervalIterator.h
 llvm-devel/include/llvm/Analysis/IntervalPartition.h
+llvm-devel/include/llvm/Analysis/IteratedDominanceFrontier.h
 llvm-devel/include/llvm/Analysis/JumpInstrTableInfo.h
 llvm-devel/include/llvm/Analysis/LazyCallGraph.h
 llvm-devel/include/llvm/Analysis/LazyValueInfo.h
@@ -312,7 +313,7 @@ llvm-devel/include/llvm/Config/Disassemblers.def
 llvm-devel/include/llvm/Config/Targets.def
 llvm-devel/include/llvm/Config/config.h
 llvm-devel/include/llvm/Config/llvm-config.h
-llvm-devel/include/llvm/DebugInfo/DWARF/DIContext.h
+llvm-devel/include/llvm/DebugInfo/DIContext.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
 llvm-devel/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
@@ -348,6 +349,7 @@ llvm-devel/include/llvm/DebugInfo/PDB/IPDBRawSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBSession.h
 llvm-devel/include/llvm/DebugInfo/PDB/IPDBSourceFile.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDB.h
+llvm-devel/include/llvm/DebugInfo/PDB/PDBContext.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBExtras.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBSymDumper.h
 llvm-devel/include/llvm/DebugInfo/PDB/PDBSymbol.h
@@ -392,11 +394,11 @@ llvm-devel/include/llvm/ExecutionEngine/MCJIT.h
 llvm-devel/include/llvm/ExecutionEngine/OProfileWrapper.h
 llvm-devel/include/llvm/ExecutionEngine/ObjectCache.h
 llvm-devel/include/llvm/ExecutionEngine/ObjectMemoryBuffer.h
-llvm-devel/include/llvm/ExecutionEngine/Orc/CloneSubModule.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/CompileUtils.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/JITSymbol.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/LambdaResolver.h
@@ -616,6 +618,7 @@ llvm-devel/include/llvm/Support/BlockFrequency.h
 llvm-devel/include/llvm/Support/BranchProbability.h
 llvm-devel/include/llvm/Support/CBindingWrapping.h
 llvm-devel/include/llvm/Support/COFF.h
+llvm-devel/include/llvm/Support/COM.h
 llvm-devel/include/llvm/Support/Capacity.h
 llvm-devel/include/llvm/Support/Casting.h
 llvm-devel/include/llvm/Support/CodeGen.h
@@ -671,6 +674,7 @@ llvm-devel/include/llvm/Support/MathExtras.h
 llvm-devel/include/llvm/Support/Memory.h
 llvm-devel/include/llvm/Support/MemoryBuffer.h
 llvm-devel/include/llvm/Support/MemoryObject.h
+llvm-devel/include/llvm/Support/MipsABIFlags.h
 llvm-devel/include/llvm/Support/Mutex.h
 llvm-devel/include/llvm/Support/MutexGuard.h
 llvm-devel/include/llvm/Support/OnDiskHashTable.h