https://github.com/qiongsiwu updated
https://github.com/llvm/llvm-project/pull/101336
>From e823d1e7eb3357fc5c15b614ac5fd94d331ac630 Mon Sep 17 00:00:00 2001
From: Qiongsi Wu <q...@ibm.com>
Date: Wed, 31 Jul 2024 10:12:59 -0400
Subject: [PATCH 1/2] Turn on mc_func check by default.
---
clang/include/clang/Driver/Options.td | 2 +-
clang/include/clang/Lex/PreprocessorOptions.h | 4 ++--
clang/lib/Driver/ToolChains/AIX.cpp | 2 +-
clang/test/Preprocessor/pragma_mc_func.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index c8c56dbb51b28..7f6b8ba4d7eeb 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -8097,7 +8097,7 @@ def source_date_epoch : Separate<["-"],
"source-date-epoch">,
} // let Visibility = [CC1Option]
defm err_pragma_mc_func_aix : BoolFOption<"err-pragma-mc-func-aix",
- PreprocessorOpts<"ErrorOnPragmaMcfuncOnAIX">, DefaultFalse,
+ PreprocessorOpts<"ErrorOnPragmaMcfuncOnAIX">, DefaultTrue,
PosFlag<SetTrue, [], [ClangOption, CC1Option],
"Treat uses of #pragma mc_func as errors">,
NegFlag<SetFalse,[], [ClangOption, CC1Option],
diff --git a/clang/include/clang/Lex/PreprocessorOptions.h
b/clang/include/clang/Lex/PreprocessorOptions.h
index 3f7dd9db18ba7..f48b7ecb90e1e 100644
--- a/clang/include/clang/Lex/PreprocessorOptions.h
+++ b/clang/include/clang/Lex/PreprocessorOptions.h
@@ -213,7 +213,7 @@ class PreprocessorOptions {
/// If set, the preprocessor reports an error when processing #pragma mc_func
/// on AIX.
- bool ErrorOnPragmaMcfuncOnAIX = false;
+ bool ErrorOnPragmaMcfuncOnAIX = true;
public:
PreprocessorOptions() : PrecompiledPreambleBytes(0, false) {}
@@ -252,7 +252,7 @@ class PreprocessorOptions {
PrecompiledPreambleBytes.first = 0;
PrecompiledPreambleBytes.second = false;
RetainExcludedConditionalBlocks = false;
- ErrorOnPragmaMcfuncOnAIX = false;
+ ErrorOnPragmaMcfuncOnAIX = true;
}
};
diff --git a/clang/lib/Driver/ToolChains/AIX.cpp
b/clang/lib/Driver/ToolChains/AIX.cpp
index b2885b7776d13..f0e7acac688fc 100644
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -562,7 +562,7 @@ void AIX::addClangTargetOptions(
CC1Args.push_back("-fno-sized-deallocation");
if (Args.hasFlag(options::OPT_ferr_pragma_mc_func_aix,
- options::OPT_fno_err_pragma_mc_func_aix, false))
+ options::OPT_fno_err_pragma_mc_func_aix, true))
CC1Args.push_back("-ferr-pragma-mc-func-aix");
else
CC1Args.push_back("-fno-err-pragma-mc-func-aix");
diff --git a/clang/test/Preprocessor/pragma_mc_func.c
b/clang/test/Preprocessor/pragma_mc_func.c
index f0d3e49e5dddc..8d172f8490e25 100644
--- a/clang/test/Preprocessor/pragma_mc_func.c
+++ b/clang/test/Preprocessor/pragma_mc_func.c
@@ -1,3 +1,4 @@
+// RUN: not %clang --target=powerpc64-ibm-aix -fsyntax-only %s 2>&1 |
FileCheck %s
// RUN: not %clang --target=powerpc64-ibm-aix -ferr-pragma-mc-func-aix
-fsyntax-only \
// RUN: %s 2>&1 | FileCheck %s
#pragma mc_func asm_barrier {"60000000"}
@@ -8,11 +9,10 @@
// RUN: %clang --target=powerpc64-ibm-aix -fno-err-pragma-mc-func-aix
-fsyntax-only %s
// RUN: %clang --target=powerpc64-ibm-aix -ferr-pragma-mc-func-aix
-fsyntax-only \
// RUN: -fno-err-pragma-mc-func-aix %s
-// RUN: %clang --target=powerpc64-ibm-aix -fsyntax-only %s
// RUN: %clang --target=powerpc64-ibm-aix -Werror=unknown-pragmas \
// RUN: -fno-err-pragma-mc-func-aix -fsyntax-only %s
-// Cases where we have errors or warnings.
+// Cases on a non-AIX target.
// RUN: not %clang --target=powerpc64le-unknown-linux-gnu \
// RUN: -Werror=unknown-pragmas -fno-err-pragma-mc-func-aix -fsyntax-only %s
2>&1 | \
// RUN: FileCheck --check-prefix=UNUSED %s
>From 16280f9527a02d61789ca310bd4418fb33112ef2 Mon Sep 17 00:00:00 2001
From: Qiongsi Wu <q...@ibm.com>
Date: Wed, 31 Jul 2024 11:25:07 -0400
Subject: [PATCH 2/2] Remove unnecessary CC1 option.
---
clang/include/clang/Driver/Options.td | 2 +-
clang/lib/Driver/ToolChains/AIX.cpp | 6 ++----
clang/test/Preprocessor/pragma_mc_func.c | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 7f6b8ba4d7eeb..c155ff8e7003d 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -8098,7 +8098,7 @@ def source_date_epoch : Separate<["-"],
"source-date-epoch">,
defm err_pragma_mc_func_aix : BoolFOption<"err-pragma-mc-func-aix",
PreprocessorOpts<"ErrorOnPragmaMcfuncOnAIX">, DefaultTrue,
- PosFlag<SetTrue, [], [ClangOption, CC1Option],
+ PosFlag<SetTrue, [], [ClangOption],
"Treat uses of #pragma mc_func as errors">,
NegFlag<SetFalse,[], [ClangOption, CC1Option],
"Ignore uses of #pragma mc_func">>;
diff --git a/clang/lib/Driver/ToolChains/AIX.cpp
b/clang/lib/Driver/ToolChains/AIX.cpp
index f0e7acac688fc..aa51c1a8df58c 100644
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -561,10 +561,8 @@ void AIX::addClangTargetOptions(
options::OPT_fno_sized_deallocation))
CC1Args.push_back("-fno-sized-deallocation");
- if (Args.hasFlag(options::OPT_ferr_pragma_mc_func_aix,
- options::OPT_fno_err_pragma_mc_func_aix, true))
- CC1Args.push_back("-ferr-pragma-mc-func-aix");
- else
+ if (!Args.hasFlag(options::OPT_ferr_pragma_mc_func_aix,
+ options::OPT_fno_err_pragma_mc_func_aix, true))
CC1Args.push_back("-fno-err-pragma-mc-func-aix");
}
diff --git a/clang/test/Preprocessor/pragma_mc_func.c
b/clang/test/Preprocessor/pragma_mc_func.c
index 8d172f8490e25..bf12f7107ff5c 100644
--- a/clang/test/Preprocessor/pragma_mc_func.c
+++ b/clang/test/Preprocessor/pragma_mc_func.c
@@ -1,6 +1,8 @@
// RUN: not %clang --target=powerpc64-ibm-aix -fsyntax-only %s 2>&1 |
FileCheck %s
// RUN: not %clang --target=powerpc64-ibm-aix -ferr-pragma-mc-func-aix
-fsyntax-only \
// RUN: %s 2>&1 | FileCheck %s
+// RUN: not %clang --target=powerpc64-ibm-aix -fno-err-pragma-mc-func-aix \
+// RUN: -ferr-pragma-mc-func-aix -fsyntax-only %s 2>&1 | FileCheck %s
#pragma mc_func asm_barrier {"60000000"}
// CHECK: error: #pragma mc_func is not supported
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
