Skip to content

Commit dd7a4c3

Browse files
author
Qiongsi Wu
committed
Revert "[AIX] Turn on #pragma mc_func check by default (llvm#101336)"
This reverts commit b933517.
1 parent 737c387 commit dd7a4c3

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8097,8 +8097,8 @@ def source_date_epoch : Separate<["-"], "source-date-epoch">,
80978097
} // let Visibility = [CC1Option]
80988098

80998099
defm err_pragma_mc_func_aix : BoolFOption<"err-pragma-mc-func-aix",
8100-
PreprocessorOpts<"ErrorOnPragmaMcfuncOnAIX">, DefaultTrue,
8101-
PosFlag<SetTrue, [], [ClangOption],
8100+
PreprocessorOpts<"ErrorOnPragmaMcfuncOnAIX">, DefaultFalse,
8101+
PosFlag<SetTrue, [], [ClangOption, CC1Option],
81028102
"Treat uses of #pragma mc_func as errors">,
81038103
NegFlag<SetFalse,[], [ClangOption, CC1Option],
81048104
"Ignore uses of #pragma mc_func">>;

clang/include/clang/Lex/PreprocessorOptions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ class PreprocessorOptions {
213213

214214
/// If set, the preprocessor reports an error when processing #pragma mc_func
215215
/// on AIX.
216-
bool ErrorOnPragmaMcfuncOnAIX = true;
216+
bool ErrorOnPragmaMcfuncOnAIX = false;
217217

218218
public:
219219
PreprocessorOptions() : PrecompiledPreambleBytes(0, false) {}
@@ -252,7 +252,7 @@ class PreprocessorOptions {
252252
PrecompiledPreambleBytes.first = 0;
253253
PrecompiledPreambleBytes.second = false;
254254
RetainExcludedConditionalBlocks = false;
255-
ErrorOnPragmaMcfuncOnAIX = true;
255+
ErrorOnPragmaMcfuncOnAIX = false;
256256
}
257257
};
258258

clang/lib/Driver/ToolChains/AIX.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,10 @@ void AIX::addClangTargetOptions(
561561
options::OPT_fno_sized_deallocation))
562562
CC1Args.push_back("-fno-sized-deallocation");
563563

564-
if (!Args.hasFlag(options::OPT_ferr_pragma_mc_func_aix,
565-
options::OPT_fno_err_pragma_mc_func_aix, true))
564+
if (Args.hasFlag(options::OPT_ferr_pragma_mc_func_aix,
565+
options::OPT_fno_err_pragma_mc_func_aix, false))
566+
CC1Args.push_back("-ferr-pragma-mc-func-aix");
567+
else
566568
CC1Args.push_back("-fno-err-pragma-mc-func-aix");
567569
}
568570

clang/test/Preprocessor/pragma_mc_func.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
// RUN: not %clang --target=powerpc64-ibm-aix -fsyntax-only %s 2>&1 | FileCheck %s
21
// RUN: not %clang --target=powerpc64-ibm-aix -ferr-pragma-mc-func-aix -fsyntax-only \
32
// RUN: %s 2>&1 | FileCheck %s
4-
// RUN: not %clang --target=powerpc64-ibm-aix -fno-err-pragma-mc-func-aix \
5-
// RUN: -ferr-pragma-mc-func-aix -fsyntax-only %s 2>&1 | FileCheck %s
63
#pragma mc_func asm_barrier {"60000000"}
74

85
// CHECK: error: #pragma mc_func is not supported
@@ -11,10 +8,11 @@
118
// RUN: %clang --target=powerpc64-ibm-aix -fno-err-pragma-mc-func-aix -fsyntax-only %s
129
// RUN: %clang --target=powerpc64-ibm-aix -ferr-pragma-mc-func-aix -fsyntax-only \
1310
// RUN: -fno-err-pragma-mc-func-aix %s
11+
// RUN: %clang --target=powerpc64-ibm-aix -fsyntax-only %s
1412
// RUN: %clang --target=powerpc64-ibm-aix -Werror=unknown-pragmas \
1513
// RUN: -fno-err-pragma-mc-func-aix -fsyntax-only %s
1614

17-
// Cases on a non-AIX target.
15+
// Cases where we have errors or warnings.
1816
// RUN: not %clang --target=powerpc64le-unknown-linux-gnu \
1917
// RUN: -Werror=unknown-pragmas -fno-err-pragma-mc-func-aix -fsyntax-only %s 2>&1 | \
2018
// RUN: FileCheck --check-prefix=UNUSED %s

0 commit comments

Comments
 (0)