Author: Michael Platings Date: 2023-06-29T09:08:15+01:00 New Revision: dc8cbbd55f807e832bf8c500205b0f4184531b00
URL: https://github.com/llvm/llvm-project/commit/dc8cbbd55f807e832bf8c500205b0f4184531b00 DIFF: https://github.com/llvm/llvm-project/commit/dc8cbbd55f807e832bf8c500205b0f4184531b00.diff LOG: [Clang][Driver] Change missing multilib error to warning The error could be awkward to work around when experimenting with flags that didn't have a matching multilib. It also broke many tests when multilib.yaml was present in the build directory. Reviewed By: simon_tatham, MaskRay Differential Revision: https://reviews.llvm.org/D153885 Added: Modified: clang/include/clang/Basic/DiagnosticDriverKinds.td clang/lib/Driver/ToolChains/BareMetal.cpp clang/test/Driver/baremetal-multilib.yaml Removed: ################################################################################ diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td index d2253bb84a0441..d8112641eaf58f 100644 --- a/clang/include/clang/Basic/DiagnosticDriverKinds.td +++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td @@ -737,8 +737,9 @@ def err_drv_loongarch_invalid_mfpu_EQ : Error< def err_drv_expand_response_file : Error< "failed to expand response file: %0">; -def err_drv_no_matching_multilib : Error< - "no multilib found matching flags: %0">; +def warn_drv_missing_multilib : Warning< + "no multilib found matching flags: %0">, + InGroup<DiagGroup<"missing-multilib">>; def note_drv_available_multilibs : Note< "available multilibs are:%0">; } diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp index 47a533501ec730..d56bfafe6dfe1f 100644 --- a/clang/lib/Driver/ToolChains/BareMetal.cpp +++ b/clang/lib/Driver/ToolChains/BareMetal.cpp @@ -175,7 +175,7 @@ static void findMultilibsFromYAML(const ToolChain &TC, const Driver &D, Result.Multilibs = ErrorOrMultilibSet.get(); if (Result.Multilibs.select(Flags, Result.SelectedMultilibs)) return; - D.Diag(clang::diag::err_drv_no_matching_multilib) << llvm::join(Flags, " "); + D.Diag(clang::diag::warn_drv_missing_multilib) << llvm::join(Flags, " "); std::stringstream ss; for (const Multilib &Multilib : Result.Multilibs) ss << "\n" << llvm::join(Multilib.flags(), " "); diff --git a/clang/test/Driver/baremetal-multilib.yaml b/clang/test/Driver/baremetal-multilib.yaml index e3281fa3b04b6e..af26e82621c91e 100644 --- a/clang/test/Driver/baremetal-multilib.yaml +++ b/clang/test/Driver/baremetal-multilib.yaml @@ -23,7 +23,7 @@ # RUN: %T/baremetal_multilib/bin/clang -no-canonical-prefixes -x c++ %s -### -o %t.out 2>&1 \ # RUN: --target=thumbv7em-none-eabi -mfpu=fpv4-sp-d16 --sysroot= \ # RUN: | FileCheck --check-prefix=CHECK-NO-MATCH %s -# CHECK-NO-MATCH: error: no multilib found matching flags: +# CHECK-NO-MATCH: warning: no multilib found matching flags: # CHECK-NO-MATCH-SAME: --target=thumbv7em-none-unknown-eabi # CHECK-NO-MATCH: note: available multilibs are: # CHECK-NO-MATCH: --target=thumbv6m-none-unknown-eabi -mfpu=none _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
