llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-powerpc Author: None (llvmbot) <details> <summary>Changes</summary> Backport dd7a4c3e5ee3300588b7c12631f3305553d8ea6c Requested by: @<!-- -->qiongsiwu --- Full diff: https://github.com/llvm/llvm-project/pull/101737.diff 4 Files Affected: - (modified) clang/include/clang/Driver/Options.td (+2-2) - (modified) clang/include/clang/Lex/PreprocessorOptions.h (+2-2) - (modified) clang/lib/Driver/ToolChains/AIX.cpp (+4-2) - (modified) clang/test/Preprocessor/pragma_mc_func.c (+2-4) ``````````diff diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index bed6e7af9dce9..359a698ea87dd 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -8087,8 +8087,8 @@ 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">, DefaultTrue, - PosFlag<SetTrue, [], [ClangOption], + PreprocessorOpts<"ErrorOnPragmaMcfuncOnAIX">, DefaultFalse, + PosFlag<SetTrue, [], [ClangOption, CC1Option], "Treat uses of #pragma mc_func as errors">, NegFlag<SetFalse,[], [ClangOption, CC1Option], "Ignore uses of #pragma mc_func">>; diff --git a/clang/include/clang/Lex/PreprocessorOptions.h b/clang/include/clang/Lex/PreprocessorOptions.h index f48b7ecb90e1e..3f7dd9db18ba7 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 = true; + bool ErrorOnPragmaMcfuncOnAIX = false; public: PreprocessorOptions() : PrecompiledPreambleBytes(0, false) {} @@ -252,7 +252,7 @@ class PreprocessorOptions { PrecompiledPreambleBytes.first = 0; PrecompiledPreambleBytes.second = false; RetainExcludedConditionalBlocks = false; - ErrorOnPragmaMcfuncOnAIX = true; + ErrorOnPragmaMcfuncOnAIX = false; } }; diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp index 0615a8a9e8d17..fb780fb75651d 100644 --- a/clang/lib/Driver/ToolChains/AIX.cpp +++ b/clang/lib/Driver/ToolChains/AIX.cpp @@ -558,8 +558,10 @@ 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)) + if (Args.hasFlag(options::OPT_ferr_pragma_mc_func_aix, + options::OPT_fno_err_pragma_mc_func_aix, false)) + 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 bf12f7107ff5c..f0d3e49e5dddc 100644 --- a/clang/test/Preprocessor/pragma_mc_func.c +++ b/clang/test/Preprocessor/pragma_mc_func.c @@ -1,8 +1,5 @@ -// 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 @@ -11,10 +8,11 @@ // 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 on a non-AIX target. +// Cases where we have errors or warnings. // 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 `````````` </details> https://github.com/llvm/llvm-project/pull/101737 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
