From 97de2c13aebfe86d089751362aa3db71219faa85 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 4 Sep 2018 10:22:42 +0200 Subject: [PATCH] Disable OpenMP on unsupported architectures --- debian/changelog | 8 ++++++++ debian/rules | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57c20af9..5e9ef335 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-7 (1:7~+rc2-1~exp4) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable OpenMP on unsupported architectures powerpc, + powerpcspe, riscv64 and sparc64 (Closes: #907912) + + -- John Paul Adrian Glaubitz Tue, 04 Sep 2018 10:20:57 +0200 + llvm-toolchain-7 (1:7~+rc2-1~exp3) experimental; urgency=medium * Remove libtool flex, bison, dejagnu, tcl, expect, diff --git a/debian/rules b/debian/rules index de61398b..3a552d17 100755 --- a/debian/rules +++ b/debian/rules @@ -262,7 +262,7 @@ override_dh_auto_configure: preconfigure ln -s ../compiler-rt .; \ readlink compiler-rt -ifeq (,$(filter $(DEB_HOST_ARCH), s390x)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe riscv64 sparc64 s390x)) cd projects/ && \ if test -h openmp; then \ rm openmp; \ @@ -428,7 +428,7 @@ build_doc: echo "Generating manpage of $$f"; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done -ifeq (,$(filter $(DEB_HOST_ARCH), s390x)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe riscv64 sparc64 s390x)) cd openmp/runtime && doxygen doc/doxygen/config cd openmp/runtime/doc/doxygen/generated/html/ && rm jquery.js && ln -s /usr/share/javascript/jquery/jquery.js endif @@ -456,7 +456,7 @@ override_dh_auto_install: ln -s libomp.so.$(SONAME_OPENMP) libomp.so -ifeq (,$(filter $(DEB_HOST_ARCH), s390x)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe riscv64 sparc64 s390x)) mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp cp -f openmp/runtime/exports/common*/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp endif