From: Raspbian forward pporter Date: Mon, 1 Jan 2018 20:23:42 +0000 (+0000) Subject: Merge version 1:3.8.1-24+rpi1 and 1:3.8.1-27 to produce 1:3.8.1-27+rpi1 X-Git-Tag: archive/raspbian/1%3.8.1-27+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7222d61766cfb877d498a868b349ad7a48fe24f3;p=llvm-toolchain-3.8.git Merge version 1:3.8.1-24+rpi1 and 1:3.8.1-27 to produce 1:3.8.1-27+rpi1 --- 7222d61766cfb877d498a868b349ad7a48fe24f3 diff --cc debian/changelog index 94d165ca,a84271f8..88d740f1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,28 -1,39 +1,65 @@@ - llvm-toolchain-3.8 (1:3.8.1-24+rpi1) stretch-staging; urgency=medium ++llvm-toolchain-3.8 (1:3.8.1-27+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * Pass armv6-* as triplet rather than arm-* to hopefully stop llvm toolchain + assuming armv7. (didn't work, it appears that Debian isn't currently using + the autoconf based build). + * Cleanup .pyc files in clean target. + * Add a hack to the cmake based build to force armv6 (unfortunately the cmake + based build relies on config.guess which assumes you want to build for the + hardware you are running on). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix.cmake + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + [changes introduced in 1:3.8.1-12+rpi1 by Peter Michael Green] + * Disable testsuite, it seems to be crashing buildboxes. + + [changes brought forward from 1:3.8.1-12+rpi2 by Peter Michael Green at Mon, 03 Oct 2016 22:58:38 +0000] + * Really disable testsuite. + + [changes introduced in 1:3.8.1-17+rpi1 by Peter Michael Green] + * Remove more crap in clean target. + * Force creation of debian/man. + * Set config.guess.hack back to mode 644 in clean target to keep dgit happy. + - -- Raspbian forward porter Mon, 26 Jun 2017 23:20:55 +0000 ++ -- Raspbian forward porter Mon, 01 Jan 2018 20:23:39 +0000 ++ + llvm-toolchain-3.8 (1:3.8.1-27) unstable; urgency=medium + + * Really fix the latomic link on armel (called armv7l on cmake) + So, using arm.* to link against latomic + + -- Sylvestre Ledru Sat, 23 Dec 2017 23:00:21 +0100 + + llvm-toolchain-3.8 (1:3.8.1-26) unstable; urgency=medium + + * Also link latomic on armel + * Add the keep alive to hopefully fix the armhf timeout + + -- Sylvestre Ledru Fri, 22 Dec 2017 09:48:48 +0100 + + llvm-toolchain-3.8 (1:3.8.1-25) unstable; urgency=medium + + * Fix the detection of gcc (Closes: #853523) + * Force the deactivation of ocaml until the transition is done + * Standards-Version: 4.1.0 + * Backport the gsplit dwarf fix (Closes: #853523) + * Try to fix the mipsel FTBFS (Closes: #877567) + I am trying the first option from the bug: + - gsplit-dward on 32 bits archs + - -g everywhere + Many thanks to Adrian Bunk for that + * clang was producing unusable binaries on armv5tel (Closes: #868779) + Thanks to Adrian Bunk for the patch + * Backport the patch for bind (ftfbs-gcc.diff) + + [ Gianfranco Costamagna, John Paul Adrian Glaubitz ] + * Add powerpcspe to latomic archs + + [ Gianfranco Costamagna ] + * use -g1 where Debug symbols have a 1GB size + + -- Sylvestre Ledru Sat, 21 Oct 2017 13:43:31 +0200 llvm-toolchain-3.8 (1:3.8.1-24) unstable; urgency=medium diff --cc debian/patches/series index 62c0d5da,0a9691fe..4d8ce009 --- a/debian/patches/series +++ b/debian/patches/series @@@ -59,6 -59,5 +59,8 @@@ lldb-server-link.dif add_symbols_versioning.patch fix-R_AARCH64_MOVW_UABS_G3-relocation.patch asan-48bit-VMA-aarch64.patch + ftfbs-gcc.diff + test-keep-alive.diff +cmake-arm-version-hack.patch +remove-more-crap-in-clean-target +use-dpkg-architecture-instead-of-config. diff --cc debian/rules index 582b195a,b471a8ad..bd6924d9 --- a/debian/rules +++ b/debian/rules @@@ -30,8 -33,24 +33,24 @@@ DEB_HOST_ARCH = $(shell dpkg-arch LDFLAGS_EXTRA = CXXFLAGS_EXTRA = -std=c++0x -gsplit-dwarf CONFIGURE_EXTRA = -CMAKE_EXTRA = +CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF + # Only enable gsplit dwarf on archs which needs it (32 bits) + ifeq ($(DEB_HOST_ARCH_BITS),32) + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.22.52.0.4 ; echo $$?),0) + # when using -gsplit-dwarf, it will requires extract-dwo which doesn't exist on precise: + # More: https://llvm.org/bugs/show_bug.cgi?id=28841 + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 7.1.0-7~ || \ + dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 7.2.0-2; echo $$?),0) + # Only pass -gsplit-dwarf with working version of gcc 7 + # More: https://bugs.llvm.org/show_bug.cgi?id=34140 & https://bugs.debian.org/873609 + CXXFLAGS_EXTRA += -gsplit-dwarf + else + $(error "Broken gcc version for -gsplit-dwarf support. Please use < gcc 7 or >= 7.2.0-2") + endif # < gcc 7 or >= 7.2.0-2 + endif # binutils + endif # archs + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) lt 4.7.2-10~ ; echo $$?),0) # Too old version of gcc. Force 4.9 GCC_VERSION := 4.9