This revision was automatically updated to reflect the committed changes. Closed by commit rGdc8cbbd55f80: [Clang][Driver] Change missing multilib error to warning (authored by michaelplatings).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D153885/new/ https://reviews.llvm.org/D153885 Files: clang/include/clang/Basic/DiagnosticDriverKinds.td clang/lib/Driver/ToolChains/BareMetal.cpp clang/test/Driver/baremetal-multilib.yaml Index: clang/test/Driver/baremetal-multilib.yaml =================================================================== --- clang/test/Driver/baremetal-multilib.yaml +++ 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 Index: clang/lib/Driver/ToolChains/BareMetal.cpp =================================================================== --- clang/lib/Driver/ToolChains/BareMetal.cpp +++ clang/lib/Driver/ToolChains/BareMetal.cpp @@ -175,7 +175,7 @@ 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(), " "); Index: clang/include/clang/Basic/DiagnosticDriverKinds.td =================================================================== --- clang/include/clang/Basic/DiagnosticDriverKinds.td +++ clang/include/clang/Basic/DiagnosticDriverKinds.td @@ -737,8 +737,9 @@ 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">; }
Index: clang/test/Driver/baremetal-multilib.yaml =================================================================== --- clang/test/Driver/baremetal-multilib.yaml +++ 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 Index: clang/lib/Driver/ToolChains/BareMetal.cpp =================================================================== --- clang/lib/Driver/ToolChains/BareMetal.cpp +++ clang/lib/Driver/ToolChains/BareMetal.cpp @@ -175,7 +175,7 @@ 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(), " "); Index: clang/include/clang/Basic/DiagnosticDriverKinds.td =================================================================== --- clang/include/clang/Basic/DiagnosticDriverKinds.td +++ clang/include/clang/Basic/DiagnosticDriverKinds.td @@ -737,8 +737,9 @@ 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">; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits