129 lines
5.2 KiB
Diff
129 lines
5.2 KiB
Diff
From 001e7941bc936847b07da2fdb4b19a8adcba7718 Mon Sep 17 00:00:00 2001
|
|
From: liyunfei <liyunfei33@huawei.com>
|
|
Date: Fri, 19 Jul 2024 10:44:49 +0800
|
|
Subject: [PATCH 1/2] Complete -fgcc-compatible option scope
|
|
|
|
Complete -fgcc-compatible option scope to Langopts and Diagopts
|
|
|
|
(cherry picked from commit 8881224782ade2afaab4860f3462e44b7d5c2601)
|
|
Signed-off-by: wangqiang <wangqiang1@kylinos.cn>
|
|
---
|
|
clang/include/clang/Basic/DiagnosticOptions.def | 4 ++++
|
|
clang/include/clang/Basic/LangOptions.def | 4 ++++
|
|
clang/include/clang/Driver/Options.td | 6 ++++--
|
|
clang/lib/Driver/ToolChains/Clang.cpp | 2 ++
|
|
clang/lib/Frontend/CompilerInvocation.cpp | 15 +++++++++++++--
|
|
5 files changed, 27 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/clang/include/clang/Basic/DiagnosticOptions.def b/clang/include/clang/Basic/DiagnosticOptions.def
|
|
index 6d0c1b14acc1..5253e951d403 100644
|
|
--- a/clang/include/clang/Basic/DiagnosticOptions.def
|
|
+++ b/clang/include/clang/Basic/DiagnosticOptions.def
|
|
@@ -99,6 +99,10 @@ VALUE_DIAGOPT(MessageLength, 32, 0)
|
|
|
|
DIAGOPT(ShowSafeBufferUsageSuggestions, 1, 0)
|
|
|
|
+#ifdef BUILD_FOR_OPENEULER
|
|
+DIAGOPT(GccCompatible, 1, 0) /// -fgcc-compatible
|
|
+#endif
|
|
+
|
|
#undef DIAGOPT
|
|
#undef ENUM_DIAGOPT
|
|
#undef VALUE_DIAGOPT
|
|
diff --git a/clang/include/clang/Basic/LangOptions.def b/clang/include/clang/Basic/LangOptions.def
|
|
index f7ec0406f33e..eb62a4951c65 100644
|
|
--- a/clang/include/clang/Basic/LangOptions.def
|
|
+++ b/clang/include/clang/Basic/LangOptions.def
|
|
@@ -468,6 +468,10 @@ LANGOPT(IncrementalExtensions, 1, 0, " True if we want to process statements"
|
|
|
|
BENIGN_LANGOPT(CheckNew, 1, 0, "Do not assume C++ operator new may not return NULL")
|
|
|
|
+#ifdef BUILD_FOR_OPENEULER
|
|
+LANGOPT(GccCompatible, 1, 0, "Enable gcc compatibility for openEuler.")
|
|
+#endif
|
|
+
|
|
#undef LANGOPT
|
|
#undef COMPATIBLE_LANGOPT
|
|
#undef BENIGN_LANGOPT
|
|
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
|
|
index 71d6ed66ab96..344c8bd49da7 100644
|
|
--- a/clang/include/clang/Driver/Options.td
|
|
+++ b/clang/include/clang/Driver/Options.td
|
|
@@ -1810,9 +1810,11 @@ def fautotune_rank : Flag<["-"], "fautotune-rank">, Group<f_Group>,
|
|
MarshallingInfoString<CodeGenOpts<"MemoryProfileUsePath">>;
|
|
|
|
#ifdef BUILD_FOR_OPENEULER
|
|
-def fgcc_compatible : Flag<["-"], "fgcc-compatible">, Group<f_Group>,
|
|
+def fgcc_compatible : Flag<["-"], "fgcc-compatible">,
|
|
+ Flags<[CC1Option]>,
|
|
+ MarshallingInfoFlag<DiagnosticOpts<"GccCompatible">>,
|
|
HelpText<"Enable gcc compatibility for openEuler.">;
|
|
-def fno_gcc_compatible : Flag<["-"], "fno-gcc-compatible">, Group<f_Group>;
|
|
+def fno_gcc_compatible : Flag<["-"], "fno-gcc-compatible">, Flags<[CC1Option]>;
|
|
#endif
|
|
|
|
// Begin sanitizer flags. These should all be core options exposed in all driver
|
|
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
|
|
index c49cb43ff19c..fac4f03d6193 100644
|
|
--- a/clang/lib/Driver/ToolChains/Clang.cpp
|
|
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
|
|
@@ -4725,6 +4725,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
|
|
CmdArgs.push_back("-Wno-error=varargs");
|
|
CmdArgs.push_back("-Wno-error=unused-value");
|
|
CmdArgs.push_back("-Wno-error=format-nonliteral");
|
|
+
|
|
+ CmdArgs.push_back("-fgcc-compatible");
|
|
}
|
|
#endif
|
|
|
|
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
|
|
index 1fba91bed041..d7b609ef276c 100644
|
|
--- a/clang/lib/Frontend/CompilerInvocation.cpp
|
|
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
|
|
@@ -818,8 +818,9 @@ static void addDiagnosticArgs(ArgList &Args, OptSpecifier Group,
|
|
std::vector<std::string> &Diagnostics) {
|
|
for (auto *A : Args.filtered(Group)) {
|
|
if (A->getOption().getKind() == Option::FlagClass) {
|
|
- // The argument is a pure flag (such as OPT_Wall or OPT_Wdeprecated). Add
|
|
- // its name (minus the "W" or "R" at the beginning) to the diagnostics.
|
|
+ // The argument is a pure flag (such as OPT_Wall or
|
|
+ // OPT_Wdeprecated). Add its name (minus the "W" or "R" at the
|
|
+ // beginning) to the diagnostics.
|
|
Diagnostics.push_back(
|
|
std::string(A->getOption().getName().drop_front(1)));
|
|
} else if (A->getOption().matches(GroupWithValue)) {
|
|
@@ -829,6 +830,7 @@ static void addDiagnosticArgs(ArgList &Args, OptSpecifier Group,
|
|
std::string(A->getOption().getName().drop_front(1).rtrim("=-")));
|
|
} else {
|
|
// Otherwise, add its value (for OPT_W_Joined and similar).
|
|
+
|
|
Diagnostics.push_back(A->getValue());
|
|
}
|
|
}
|
|
@@ -3522,6 +3524,11 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
|
|
|
|
if (!Opts.RandstructSeed.empty())
|
|
GenerateArg(Args, OPT_frandomize_layout_seed_EQ, Opts.RandstructSeed, SA);
|
|
+
|
|
+#ifdef BUILD_FOR_OPENEULER
|
|
+ if (Opts.GccCompatible)
|
|
+ GenerateArg(Args, OPT_fgcc_compatible, SA);
|
|
+#endif
|
|
}
|
|
|
|
bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
|
|
@@ -4073,6 +4080,10 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
|
|
Diags.Report(diag::err_drv_hlsl_unsupported_target) << T.str();
|
|
}
|
|
|
|
+#ifdef BUILD_FOR_OPENEULER
|
|
+ Opts.GccCompatible = Args.hasArg(options::OPT_fgcc_compatible);
|
|
+#endif
|
|
+
|
|
return Diags.getNumErrors() == NumErrorsBefore;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|