diff --git a/debian/changelog b/debian/changelog index 207d0971..32d3575e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,6 @@ llvm-toolchain-snapshot (1:13~++20210403031832+89afec348dbd-1~exp1) UNRELEASED; * New snapshot release * "run-clang-tidy" install it * Only enable libomp-13-doc on supported archs - * Cherry-pick https://reviews.llvm.org/D99501 to allow -flto=auto * Verify that /proc is mounted. It makes some unexpected issues when building from a chroot without /proc * Fix the __config_site include issue diff --git a/debian/patches/D99501-ignore-lto-auto.diff b/debian/patches/D99501-ignore-lto-auto.diff deleted file mode 100644 index eff887c2..00000000 --- a/debian/patches/D99501-ignore-lto-auto.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: llvm-toolchain-snapshot_13~++20210330090254+142d522dedbb/clang/include/clang/Driver/Driver.h -=================================================================== ---- llvm-toolchain-snapshot_13~++20210330090254+142d522dedbb.orig/clang/include/clang/Driver/Driver.h -+++ llvm-toolchain-snapshot_13~++20210330090254+142d522dedbb/clang/include/clang/Driver/Driver.h -@@ -51,7 +51,8 @@ enum LTOKind { - LTOK_None, - LTOK_Full, - LTOK_Thin, -- LTOK_Unknown -+ LTOK_Unknown, -+ LTOK_Ignored - }; - - /// Driver - Encapsulate logic for constructing compilation processes -Index: llvm-toolchain-snapshot_13~++20210330090254+142d522dedbb/clang/lib/Driver/Driver.cpp -=================================================================== ---- llvm-toolchain-snapshot_13~++20210330090254+142d522dedbb.orig/clang/lib/Driver/Driver.cpp -+++ llvm-toolchain-snapshot_13~++20210330090254+142d522dedbb/clang/lib/Driver/Driver.cpp -@@ -610,9 +610,12 @@ void Driver::setLTOMode(const llvm::opt: - LTOMode = llvm::StringSwitch(LTOName) - .Case("full", LTOK_Full) - .Case("thin", LTOK_Thin) -+ .Case("auto", LTOK_Ignored) -+ .Case("jobserver", LTOK_Ignored) - .Default(LTOK_Unknown); - - if (LTOMode == LTOK_Unknown) { -+ // FIXME: check if argument is a number, then ignore, or handle it - assert(A); - Diag(diag::err_drv_unsupported_option_argument) << A->getOption().getName() - << A->getValue(); diff --git a/debian/patches/series b/debian/patches/series index e82d9f05..6b1a0afe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -145,5 +145,4 @@ print-lldb-path.patch libcxx-armhf-ftbfs.diff lld-use-link-atomic-i386.diff lower-python-dep.diff -D99501-ignore-lto-auto.diff revert-D95727-causes-49818.diff