From a8c8177356653c882de6dda851c3b1141d8e5f4b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 11 Nov 2016 18:19:14 +0000 Subject: [PATCH 1/4] fix the patch --- debian/patches/lit-force-lang.diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/lit-force-lang.diff b/debian/patches/lit-force-lang.diff index 37a5d2cd..84e65583 100644 --- a/debian/patches/lit-force-lang.diff +++ b/debian/patches/lit-force-lang.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-3.8-3.8.1/projects/compiler-rt/test/lit.common.cfg +Index: llvm-toolchain-3.9-3.9~svn275918/compiler-rt/test/lit.common.cfg =================================================================== ---- llvm-toolchain-3.8-3.8.1.orig/projects/compiler-rt/test/lit.common.cfg -+++ llvm-toolchain-3.8-3.8.1/projects/compiler-rt/test/lit.common.cfg -@@ -120,7 +120,7 @@ def is_linux_lto_supported(): +--- llvm-toolchain-3.9-3.9~svn275918.orig/compiler-rt/test/lit.common.cfg ++++ llvm-toolchain-3.9-3.9~svn275918/compiler-rt/test/lit.common.cfg +@@ -148,7 +148,7 @@ def is_linux_lto_supported(): if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')): return False From 755bc6aaf9e28b1ef58b94ff03145580448542c7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 13 Nov 2016 12:40:47 +0000 Subject: [PATCH 2/4] Disable NEON generation on armhf (Closes: #841474, #842142) Thanks to Pauli for the fix --- debian/changelog | 7 +++++++ .../patches/clang-arm-default-vfp3-on-armv7a.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 21 insertions(+) create mode 100644 debian/patches/clang-arm-default-vfp3-on-armv7a.patch diff --git a/debian/changelog b/debian/changelog index 8156d8a7..42a00c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.8 (1:3.8.1-17) unstable; urgency=medium + + * Disable NEON generation on armhf (Closes: #841474, #842142) + Thanks to Pauli for the fix + + -- Sylvestre Ledru Sun, 13 Nov 2016 13:38:01 +0100 + llvm-toolchain-3.8 (1:3.8.1-16) unstable; urgency=medium * Fix segfaults in the memory sanitizers (Closes: #842642) diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch new file mode 100644 index 00000000..0a2dbbc3 --- /dev/null +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.8-3.8.1/include/llvm/Support/ARMTargetParser.def +=================================================================== +--- llvm-toolchain-3.8-3.8.1.orig/include/llvm/Support/ARMTargetParser.def ++++ llvm-toolchain-3.8-3.8.1/include/llvm/Support/ARMTargetParser.def +@@ -75,7 +75,7 @@ ARM_ARCH("armv6kz", AK_ARMV6KZ, "6KZ", " + ARM_ARCH("armv6-m", AK_ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M, + FK_NONE, AEK_NONE) + ARM_ARCH("armv7-a", AK_ARMV7A, "7-A", "v7", ARMBuildAttrs::CPUArch::v7, +- FK_NEON, AEK_DSP) ++ FK_VFPV3 /* Hard float */, AEK_DSP) + ARM_ARCH("armv7-r", AK_ARMV7R, "7-R", "v7r", ARMBuildAttrs::CPUArch::v7, + FK_NONE, (AEK_HWDIV | AEK_DSP)) + ARM_ARCH("armv7-m", AK_ARMV7M, "7-M", "v7m", ARMBuildAttrs::CPUArch::v7, diff --git a/debian/patches/series b/debian/patches/series index c2845b92..3c9c20fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -53,3 +53,4 @@ silent-llvm-symbolizer.diff upstream-msan-prevent-initialization-failure.diff upstream-asan-msan-fix-reallocation-logic.diff lit-force-lang.diff +clang-arm-default-vfp3-on-armv7a.patch From fc2a841c57d1276ad60041a084d844b057a760f0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 15 Nov 2016 16:06:51 +0000 Subject: [PATCH 3/4] remove syntax not understood everywhere --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 80c274d8..66c2dd35 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, libedit-dev, swig, python-six, python-sphinx, ocaml-nox, binutils-dev, libjsoncpp-dev, lcov, procps, help2man, dh-ocaml, zlib1g-dev, - g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32] + g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32] Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, libllvm-3.8-ocaml-dev Standards-Version: 3.9.8 From dac33f327f2cf2adc3a4b1894ed92684f25fdf35 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Dec 2016 09:08:07 +0000 Subject: [PATCH 4/4] * Remove the info section from the generated manpages (Closes: #846269) * Fix the path to lldb-server (to lldb-server-3.8) (Closes: #846638) * Also install python-lldb-3.8 when installing lldb-3.8 (Closes: #846612) * Disable libedit usage in lldb because of garbage (Closes: #846616) --- debian/changelog | 4 ++++ debian/control | 4 ++-- debian/patches/lldb-server-path.diff | 13 +++++++++++++ debian/patches/series | 1 + debian/rules | 11 +++++++---- 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 debian/patches/lldb-server-path.diff diff --git a/debian/changelog b/debian/changelog index 42a00c5a..fc1a11d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ llvm-toolchain-3.8 (1:3.8.1-17) unstable; urgency=medium * Disable NEON generation on armhf (Closes: #841474, #842142) Thanks to Pauli for the fix + * Remove the info section from the generated manpages (Closes: #846269) + * Fix the path to lldb-server (to lldb-server-3.8) (Closes: #846638) + * Also install python-lldb-3.8 when installing lldb-3.8 (Closes: #846612) + * Disable libedit usage in lldb because of garbage (Closes: #846616) -- Sylvestre Ledru Sun, 13 Nov 2016 13:38:01 +0100 diff --git a/debian/control b/debian/control index 66c2dd35..8e0120df 100644 --- a/debian/control +++ b/debian/control @@ -397,8 +397,8 @@ Description: Modular compiler and toolchain technologies, examples Package: lldb-3.8 Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe sh4 x32 mips mipsel arm64 # ia64 hurd powerpc ppc64el sparc64 ppc64 mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), llvm-3.8-dev -Suggests: python-lldb-3.8 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), llvm-3.8-dev, + python-lldb-3.8 Conflicts: lldb-3.4, lldb-3.5 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger diff --git a/debian/patches/lldb-server-path.diff b/debian/patches/lldb-server-path.diff new file mode 100644 index 00000000..d7480b4e --- /dev/null +++ b/debian/patches/lldb-server-path.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-3.8-3.8.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +=================================================================== +--- llvm-toolchain-3.8-3.8.1.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-3.8-3.8.1/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -40,7 +40,7 @@ + #if defined(__APPLE__) + # define DEBUGSERVER_BASENAME "debugserver" + #else +-# define DEBUGSERVER_BASENAME "lldb-server" ++# define DEBUGSERVER_BASENAME "lldb-server-3.8" + #endif + + #if defined (HAVE_LIBCOMPRESSION) diff --git a/debian/patches/series b/debian/patches/series index 3c9c20fa..85c9ee10 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,3 +54,4 @@ upstream-msan-prevent-initialization-failure.diff upstream-asan-msan-fix-reallocation-logic.diff lit-force-lang.diff clang-arm-default-vfp3-on-armv7a.patch +lldb-server-path.diff diff --git a/debian/rules b/debian/rules index e55634c5..1dd3be8a 100755 --- a/debian/rules +++ b/debian/rules @@ -130,7 +130,10 @@ LLDB_DISABLE_ARCHS := hurd-i386 ia64 ppc64el powerpc s390x sparc64 ppc64 mips64e # hurd has threading issues ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH))) # Disable LLDB for this arch. - LLDB_ENABLE=no + LLDB_ENABLE=no +else +# See https://llvm.org/bugs/show_bug.cgi?id=28898 + CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON endif @@ -297,13 +300,13 @@ build_doc: cd $$d && rm -f underscore.js && ln -s /usr/share/javascript/underscore/underscore.js; \ done - help2man --version-string=$(LLVM_VERSION) clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 - help2man --version-string=$(LLVM_VERSION) clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 + help2man --version-string=$(LLVM_VERSION) --no-info clang/tools/scan-view/bin/scan-view > debian/man/scan-view-$(LLVM_VERSION).1 + help2man --version-string=$(LLVM_VERSION) --no-info clang/tools/clang-format/clang-format-diff.py > debian/man/clang-format-diff-$(LLVM_VERSION).1 CMDS="llvm-dwarfdump llvm-mc llvm-mcmarkup llvm-objdump llvm-rtdyld llvm-size llvm-ranlib lldb lldb-mi clang-format clang clang-tblgen clang-check clang-tidy clang-apply-replacements git-clang-format pp-trace sancov lli"; \ for f in $$CMDS; do \ echo "Generating manpage of $$f"; \ - LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-discard-stderr --version-string=$(LLVM_VERSION) $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ + LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-discard-stderr --version-string=$(LLVM_VERSION) --no-info $(TARGET_BUILD)/$(BUILD_DIR)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1; \ done override_dh_auto_install: