llvm-32: 3.8.1 -> 3.9.0

3 files changed, 105 insertions, 89 deletions

diff --git a/llvm-32/.footprint b/llvm-32/.footprint
index 11be6853..bf74c518 100644
--- a/llvm-32/.footprint
+++ b/llvm-32/.footprint
@@ -4,64 +4,90 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/llvm/
 drwxr-xr-x	root/root	usr/include/llvm/Config/
--rw-r--r--	root/root	usr/include/llvm/Config/config-32.h
 -rw-r--r--	root/root	usr/include/llvm/Config/llvm-config-32.h
 drwxr-xr-x	root/root	usr/lib32/
 -rwxr-xr-x	root/root	usr/lib32/BugpointPasses.so
-lrwxrwxrwx	root/root	usr/lib32/libLLVM-3.8.0.so -> libLLVM-3.8.so
--rwxr-xr-x	root/root	usr/lib32/libLLVM-3.8.so
--rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUAsmParser.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUAsmPrinter.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUCodeGen.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUDesc.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUInfo.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUUtils.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAnalysis.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAsmParser.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMAsmPrinter.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMBitReader.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMBitWriter.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMCodeGen.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMCore.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMDebugInfoCodeView.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMDebugInfoDWARF.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMDebugInfoPDB.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMExecutionEngine.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMIRReader.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMInstCombine.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMInstrumentation.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMInterpreter.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMLTO.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMLibDriver.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMLineEditor.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMLinker.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMMC.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMMCDisassembler.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMMCJIT.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMMCParser.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMMIRParser.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMObjCARCOpts.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMObject.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMOption.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMOrcJIT.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMPasses.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMProfileData.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMRuntimeDyld.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMScalarOpts.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMSelectionDAG.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMSupport.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMSymbolize.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMTableGen.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMTarget.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMTransformUtils.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMVectorize.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86AsmParser.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86AsmPrinter.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86CodeGen.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86Desc.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86Disassembler.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86Info.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMX86Utils.a
--rwxr-xr-x	root/root	usr/lib32/libLLVMipo.a
--rwxr-xr-x	root/root	usr/lib32/libLTO.a
+drwxr-xr-x	root/root	usr/lib32/cmake/
+drwxr-xr-x	root/root	usr/lib32/cmake/llvm/
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/AddLLVM.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/AddLLVMDefinitions.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/AddOCaml.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/AddSphinxTarget.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/CheckCompilerVersion.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/ChooseMSVCCRT.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/CrossCompile.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/DetermineGCCCompatible.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/FindOCaml.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/FindSphinx.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/GenerateVersionFromCVS.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/GetSVN.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/HandleLLVMOptions.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/HandleLLVMStdlib.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVM-Config.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMConfig.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMExports-release.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMExports.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMExternalProjectUtils.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMInstallSymlink.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/LLVMProcessSources.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/TableGen.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/llvm/VersionFromVCS.cmake
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUAsmParser.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUAsmPrinter.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUCodeGen.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUDesc.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUDisassembler.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUInfo.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAMDGPUUtils.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAnalysis.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAsmParser.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMAsmPrinter.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMBitReader.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMBitWriter.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMCodeGen.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMCore.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMCoverage.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMDebugInfoCodeView.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMDebugInfoDWARF.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMDebugInfoPDB.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMExecutionEngine.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMGlobalISel.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMIRReader.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMInstCombine.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMInstrumentation.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMInterpreter.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMLTO.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMLibDriver.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMLineEditor.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMLinker.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMMC.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMMCDisassembler.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMMCJIT.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMMCParser.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMMIRParser.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMObjCARCOpts.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMObject.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMObjectYAML.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMOption.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMOrcJIT.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMPasses.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMProfileData.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMRuntimeDyld.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMScalarOpts.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMSelectionDAG.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMSupport.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMSymbolize.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMTableGen.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMTarget.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMTransformUtils.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMVectorize.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86AsmParser.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86AsmPrinter.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86CodeGen.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86Desc.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86Disassembler.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86Info.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMX86Utils.so
+-rwxr-xr-x	root/root	usr/lib32/libLLVMipo.so
 -rwxr-xr-x	root/root	usr/lib32/libLTO.so
diff --git a/llvm-32/.md5sum b/llvm-32/.md5sum
index 67c2f223..55668c31 100644
--- a/llvm-32/.md5sum
+++ b/llvm-32/.md5sum
@@ -1 +1 @@
-538467e6028bbc9259b1e6e015d25845  llvm-3.8.1.src.tar.xz
+f2093e98060532449eb7d2fcfd0bc6c6  llvm-3.9.0.src.tar.xz
diff --git a/llvm-32/Pkgfile b/llvm-32/Pkgfile
index f73e98f8..52eabd07 100644
--- a/llvm-32/Pkgfile
+++ b/llvm-32/Pkgfile
@@ -5,47 +5,37 @@
 # Depends on: python-32 llvm
 
 name=llvm-32
-version=3.8.1
+version=3.9.0
 release=1
 source=(http://llvm.org/releases/$version/llvm-$version.src.tar.xz)
 
 build() {
 	cd llvm-$version.src
 
-	sed -i -e '/ActiveLibDir = ActivePrefix/s|lib|lib32|' \
-		tools/llvm-config/llvm-config.cpp
-
-	sed -i -e 's|LLVM_LIBDIR="${prefix}/lib"|LLVM_LIBDIR="${prefix}/lib32"|' \
-		configure
-
-	sed -i -e 's|$(PROJ_prefix)/lib|$(PROJ_prefix)/lib32|g' \
-		Makefile.config.in
-
-	mkdir build
+	install -d build $SRC/keep
 	cd build
 
-	../configure \
-		--prefix=/usr \
-		--libdir=/usr/lib32 \
-		--host=i686-pc-linux-gnu \
-		--without-oprofile \
-		--enable-cxx11 \
-		--enable-targets=x86,x86_64,r600 \
-		--enable-shared
-
-	make $MAKEFLAGS
+	cmake \
+		-DLLVM_ENABLE_CXX1Y=1 \
+		-DLLVM_INCLUDE_EXAMPLES=0 \
+		-DLLVM_INCLUDE_TESTS=0 \
+		-DLLVM_TARGETS_TO_BUILD='X86;AMDGPU' \
+		-DBUILD_SHARED_LIBS=1 \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DLLVM_LIBDIR_SUFFIX=32 \
+		-DLLVM_TARGET=i686-pc-linux-gnu  ..
+
+	MAKEFLAGS="$MAKEFLAGS" make
 	make DESTDIR=$PKG install
 
-	mv $PKG/usr/bin/llvm-config $PKG/
-	mv $PKG/usr/include/llvm/Config/{,llvm-}config.h $PKG/
-	rm -r $PKG/usr/{bin,docs,include,share}
+	# keep 32bit header and config
+	install -t $SRC/keep $PKG/usr/bin/llvm-config $PKG/usr/include/llvm/Config/llvm-config.h
 
-	# multilib
-	install -d $PKG/usr/{bin,include/llvm/Config}
-	mv $PKG/llvm-config $PKG/usr/bin/llvm-config-32
-	mv $PKG/config.h $PKG/usr/include/llvm/Config/config-32.h
-	mv $PKG/llvm-config.h $PKG/usr/include/llvm/Config/llvm-config-32.h
+	# remove unneeded files
+	rm -r $PKG/usr/{bin,include,lib32/LLVMHello.so}
 
-	# remove example hello transform
-	rm $PKG/usr/lib32/LLVMHello.so
+	# install 32bit header and config
+	install -m 0755 -D $SRC/keep/llvm-config $PKG/usr/bin/llvm-config-32
+	install -m 0644 -D $SRC/keep/llvm-config.h $PKG/usr/include/llvm/Config/llvm-config-32.h
 }