From d3853218de1a10a951e1c2e9d706b22f19e75262 Mon Sep 17 00:00:00 2001 From: Abraham Tovar Date: Mon, 11 Oct 2021 17:19:48 +0200 Subject: [PATCH] [ClassicFlang][Driver] Correct the LLVM version passed by the Driver Change the diver version to 130 since is the correct version for release_13x driver LLVM port for release_13x Change to Options.td in order to add the correct invocation for ffixed_line_length_VALUE. --- clang/include/clang/Driver/Options.td | 2 +- clang/lib/Driver/ToolChains/ClassicFlang.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 5342941367e3..2ba1ce0f3cb4 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -4495,7 +4495,7 @@ def ffixed_line_length_EQ : Joined<["-"], "ffixed-line-length=">, Group as character line width in fixed mode">, DocBrief<[{Set column after which characters are ignored in typical fixed-form lines in the source file}]>; -def ffixed_line_length_VALUE : Joined<["-"], "ffixed-line-length-">, Group, Alias, +def ffixed_line_length_VALUE : Joined<["-"], "ffixed-line-length-">, Group, HelpText<"Set line length in fixed-form format Fortran, current supporting only 72 and 132 characters">; def fopenacc : Flag<["-"], "fopenacc">, Group, HelpText<"Enable OpenACC">; diff --git a/clang/lib/Driver/ToolChains/ClassicFlang.cpp b/clang/lib/Driver/ToolChains/ClassicFlang.cpp index d3bbb4c3b95c..a40a363392cf 100644 --- a/clang/lib/Driver/ToolChains/ClassicFlang.cpp +++ b/clang/lib/Driver/ToolChains/ClassicFlang.cpp @@ -962,7 +962,7 @@ void ClassicFlang::ConstructJob(Compilation &C, const JobAction &JA, LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("121"); LowerCmdArgs.push_back("0x800"); LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("54"); LowerCmdArgs.push_back("0x10"); LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("70"); LowerCmdArgs.push_back("0x40000000"); - LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("249"); LowerCmdArgs.push_back("120"); // LLVM version + LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("249"); LowerCmdArgs.push_back("130"); // LLVM version LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("124"); LowerCmdArgs.push_back("1"); LowerCmdArgs.push_back("-y"); LowerCmdArgs.push_back("163"); LowerCmdArgs.push_back("0xc0000000"); LowerCmdArgs.push_back("-x"); LowerCmdArgs.push_back("189"); LowerCmdArgs.push_back("0x10");