================
@@ -4482,32 +4453,16 @@ bool CompilerInvocation::ParseLangArgs(LangOptions
&Opts, ArgList &Args,
!VerParts.second.getAsInteger(10, Minor)
: VerParts.first.size() == Ver.size() || VerParts.second == "0"))
{
// Got a valid version number.
- if (Major == 3 && Minor <= 8)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver3_8);
- else if (Major <= 4)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver4);
- else if (Major <= 6)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver6);
- else if (Major <= 7)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver7);
- else if (Major <= 9)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver9);
- else if (Major <= 11)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver11);
- else if (Major <= 12)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver12);
- else if (Major <= 14)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver14);
- else if (Major <= 15)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver15);
- else if (Major <= 17)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver17);
- else if (Major <= 18)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver18);
- else if (Major <= 19)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver19);
- else if (Major <= 20)
- Opts.setClangABICompat(LangOptions::ClangABI::Ver20);
+#define ABI_VER_MAJOR_MINOR(Major_, Minor_)
\
+ if (std::tie(Major, Minor) <= std::tuple(Major_, Minor_))
\
+ Opts.setClangABICompat(LangOptions::ClangABI::Ver##Major_##_##Minor_);
\
+ else
+#define ABI_VER_MAJOR(Major_)
\
+ if (Major <= Major_)
\
+ Opts.setClangABICompat(LangOptions::ClangABI::Ver##Major_);
\
+ else
+#include "clang/Basic/ABIVersions.def"
+ {} // sub-statement of the last else branch
----------------
AaronBallman wrote:
I wish we had some better way of writing this, but I've not come up with
anything. :-)
https://github.com/llvm/llvm-project/pull/151995
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
