Merge remote-tracking branch 'origin/9' into snapshot

debian/changelog

@@ -72,10 +72,9 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
 
 llvm-toolchain-9 (1:9~+rc3-1~exp3) experimental; urgency=medium
 
-  * Try to disable some options specific to BOOTSTRAP_LLVM_ENABLE_LTO
-    which aren't activated for LLVM_ENABLE_LTO causing the usage
-    of llvm-ar llvm-ranlib. Causing a huge increase of the size
-    of the .deb (because of .a and .so) and issues in the libs
+  * Force gcc before 9 (gcc 8 on Debian unstable) because it causes
+    huge increase of the size of the .deb (because of .a and .so) and
+    issues in the libs
     (Closes: #939472)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 06 Sep 2019 23:27:28 +0200

debian/control

@@ -18,7 +18,8 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
     ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x],
     libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x],
-    libpfm4-dev, python3-setuptools
+    libpfm4-dev, python3-setuptools,
+    g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7
 Build-Conflicts: oprofile, ocaml
 Standards-Version: 4.2.1
 Homepage: https://www.llvm.org/

debian/patches/series

@@ -128,8 +128,9 @@ bootstrap-fix-include-next.diff
 # riscv64
 clang-riscv64-multiarch.diff
 
+<<<<<<< HEAD
 # Compiler-rt - workaround
 workaround-bug-42994-use-linker.diff
 
-# big 939472
-try-to-unbreak-thinlto.diff
+# bug 939472
+#try-to-unbreak-thinlto.diff

debian/patches/try-to-unbreak-thinlto.diff

@@ -2,7 +2,7 @@ Index: llvm-toolchain-9-9~+rc3/clang/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-9-9~+rc3.orig/clang/CMakeLists.txt
 +++ llvm-toolchain-9-9~+rc3/clang/CMakeLists.txt
-@@ -719,11 +719,11 @@ if (CLANG_ENABLE_BOOTSTRAP)
+@@ -719,11 +719,9 @@ if (CLANG_ENABLE_BOOTSTRAP)
        if(BOOTSTRAP_LLVM_ENABLE_LLD)
          set(${CLANG_STAGE}_LINKER -DCMAKE_LINKER=${LLVM_RUNTIME_OUTPUT_INTDIR}/ld.lld)
        endif()
@@ -11,11 +11,9 @@ Index: llvm-toolchain-9-9~+rc3/clang/CMakeLists.txt
 -        set(${CLANG_STAGE}_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar)
 -        set(${CLANG_STAGE}_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib)
 -      endif()
-+#      if(NOT BOOTSTRAP_LLVM_ENABLE_LTO)
-+#        add_dependencies(clang-bootstrap-deps llvm-ar llvm-ranlib)
-+#        set(${CLANG_STAGE}_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar)
-+#        set(${CLANG_STAGE}_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib)
-+#      endif()
++      add_dependencies(clang-bootstrap-deps llvm-ar llvm-ranlib)
++      set(${CLANG_STAGE}_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar)
++      set(${CLANG_STAGE}_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib)
        add_dependencies(clang-bootstrap-deps llvm-objcopy llvm-strip)
        set(${CLANG_STAGE}_OBJCOPY -DCMAKE_OBJCOPY=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-objcopy)
        set(${CLANG_STAGE}_STRIP -DCMAKE_STRIP=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-strip)

debian/rules

@@ -67,6 +67,14 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++
 	GCC_VERSION := 4.9
 endif
 
+FORCE_NOT_GCC_9_DISTRO := eoan bullseye
+ifeq (,$(filter $(DISTRO), $(FORCE_NOT_GCC_9_DISTRO)))
+# Force gcc-8
+	GCC_VERSION := 8
+endif
+
+
+
 export CC=gcc-$(GCC_VERSION)
 export CXX=g++-$(GCC_VERSION)
 
@@ -230,7 +238,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 # armhf is not yet quite ready for Thin, it FTBFS
 # see https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-8&arch=armhf&ver=1%3A8.0.1%7E%2Brc2-1%7Eexp1&stamp=1560334266&raw=0
 ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
-	CMAKE_EXTRA += -DBOOTSTRAP_LLVM_ENABLE_LTO="Thin"
+	CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
 endif
 endif
 endif