Skip to content

Commit

Permalink
[ClassicFlang][Driver] Correct the LLVM version passed by the Driver
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
abrahamtovarmob authored and bryanpkc committed Nov 22, 2021
1 parent 51d3a43 commit d385321
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion clang/include/clang/Driver/Options.td
Original file line number Diff line number Diff line change
Expand Up @@ -4495,7 +4495,7 @@ def ffixed_line_length_EQ : Joined<["-"], "ffixed-line-length=">, Group<gfortran
HelpText<"Use <value> 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<gfortran_Group>, Alias<ffixed_line_length_EQ>,
def ffixed_line_length_VALUE : Joined<["-"], "ffixed-line-length-">, Group<gfortran_Group>,
HelpText<"Set line length in fixed-form format Fortran, current supporting only 72 and 132 characters">;
def fopenacc : Flag<["-"], "fopenacc">, Group<f_Group>,
HelpText<"Enable OpenACC">;
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Driver/ToolChains/ClassicFlang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit d385321

Please sign in to comment.