From 084ecd86b12f1144d5e0d8ebc34091817816f6ec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 5 Apr 2021 12:00:54 +0200 Subject: [PATCH 1/2] use the new version of lto auto ignore patch --- debian/patches/D99501-ignore-lto-auto.diff | 44 +++++++--------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/debian/patches/D99501-ignore-lto-auto.diff b/debian/patches/D99501-ignore-lto-auto.diff index 0c09bcc2..292b95e8 100644 --- a/debian/patches/D99501-ignore-lto-auto.diff +++ b/debian/patches/D99501-ignore-lto-auto.diff @@ -1,31 +1,13 @@ -Index: llvm-toolchain-12-12.0.0~++rc3/clang/include/clang/Driver/Driver.h -=================================================================== ---- llvm-toolchain-12-12.0.0~++rc3.orig/clang/include/clang/Driver/Driver.h -+++ llvm-toolchain-12-12.0.0~++rc3/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-12-12.0.0~++rc3/clang/lib/Driver/Driver.cpp -=================================================================== ---- llvm-toolchain-12-12.0.0~++rc3.orig/clang/lib/Driver/Driver.cpp -+++ llvm-toolchain-12-12.0.0~++rc3/clang/lib/Driver/Driver.cpp -@@ -608,9 +608,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/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td +--- a/clang/include/clang/Driver/Options.td ++++ b/clang/include/clang/Driver/Options.td +@@ -4155,6 +4155,8 @@ + defm branch_count_reg : BooleanFFlag<"branch-count-reg">, Group; + defm default_inline : BooleanFFlag<"default-inline">, Group; + defm fat_lto_objects : BooleanFFlag<"fat-lto-objects">, Group; ++def : Flag<["-"], "flto=auto">, Group; ++def : Flag<["-"], "flto=jobserver">, Group; + defm float_store : BooleanFFlag<"float-store">, Group; + defm friend_injection : BooleanFFlag<"friend-injection">, Group; + defm function_attribute_list : BooleanFFlag<"function-attribute-list">, Group; + From 29bb4b8eabe3add6d227625a0d11f554c8e7289c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 5 Apr 2021 12:03:43 +0200 Subject: [PATCH 2/2] rebase of the patches --- debian/patches/D99501-ignore-lto-auto.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/D99501-ignore-lto-auto.diff b/debian/patches/D99501-ignore-lto-auto.diff index 292b95e8..73896a07 100644 --- a/debian/patches/D99501-ignore-lto-auto.diff +++ b/debian/patches/D99501-ignore-lto-auto.diff @@ -1,7 +1,8 @@ -diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td ---- a/clang/include/clang/Driver/Options.td -+++ b/clang/include/clang/Driver/Options.td -@@ -4155,6 +4155,8 @@ +Index: llvm-toolchain-12_12.0.0~+rc4/clang/include/clang/Driver/Options.td +=================================================================== +--- llvm-toolchain-12_12.0.0~+rc4.orig/clang/include/clang/Driver/Options.td ++++ llvm-toolchain-12_12.0.0~+rc4/clang/include/clang/Driver/Options.td +@@ -4005,6 +4005,8 @@ defm reorder_blocks : BooleanFFlag<"reor defm branch_count_reg : BooleanFFlag<"branch-count-reg">, Group; defm default_inline : BooleanFFlag<"default-inline">, Group; defm fat_lto_objects : BooleanFFlag<"fat-lto-objects">, Group; @@ -10,4 +11,3 @@ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/ defm float_store : BooleanFFlag<"float-store">, Group; defm friend_injection : BooleanFFlag<"friend-injection">, Group; defm function_attribute_list : BooleanFFlag<"function-attribute-list">, Group; -