[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional updated this revision to Diff 528586.
everythingfunctional added a comment.
Merge in updates from latest main branch and resolve conflicts
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143592/new/
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/compiler_options.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/lto-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/omp-driver-offload.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/supported-suffices/f03-suffix.f03
flang/test/Driver/supported-suffices/f08-suffix.f08
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Driver/version-loops.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/ieee_is_normal.f90
flang/test/Lower/Intrinsics/isnan.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
flang/test/Lower/dummy-argument-optional.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -90,14 +90,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -106,7 +107,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@ -24,13 +24,13 @@
Fortran_main
)
-target_link_libraries(flang-new
+target_link_libraries(flang
PRIVATE
flangFrontend
flangFrontendTool
)
-clang_target_link_libraries(flang-new
+clang_target_link_libraries(flang
PRIVATE
clangDriver
clangBasic
@@ -38,9 +38,9 @@
option(FLANG_PLUGIN_SUPPORT "Build Flang with plugin support." ON)
-# Enable support for plugins, which need access to symbols from flang-new
+# Enable support for plugins, which need access to symbols from flang
if(FLANG_PLUGIN_SUPPORT)
- export_executable_symbols_for_plugins(flang-new)
+
[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional updated this revision to Diff 528585.
everythingfunctional added a comment.
Update to latest main branch
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143592/new/
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/compiler_options.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/lto-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/omp-driver-offload.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/supported-suffices/f03-suffix.f03
flang/test/Driver/supported-suffices/f08-suffix.f08
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Driver/version-loops.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/ieee_is_normal.f90
flang/test/Lower/Intrinsics/isnan.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
flang/test/Lower/dummy-argument-optional.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -90,14 +90,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -106,7 +107,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@ -24,13 +24,13 @@
Fortran_main
)
-target_link_libraries(flang-new
+target_link_libraries(flang
PRIVATE
flangFrontend
flangFrontendTool
)
-clang_target_link_libraries(flang-new
+clang_target_link_libraries(flang
PRIVATE
clangDriver
clangBasic
@@ -38,9 +38,9 @@
option(FLANG_PLUGIN_SUPPORT "Build Flang with plugin support." ON)
-# Enable support for plugins, which need access to symbols from flang-new
+# Enable support for plugins, which need access to symbols from flang
if(FLANG_PLUGIN_SUPPORT)
- export_executable_symbols_for_plugins(flang-new)
+
[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional updated this revision to Diff 507754.
everythingfunctional added a comment.
Update with main to see if tests have been fixed.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143592/new/
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/lto-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/omp-frontend-forwarding.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/supported-suffices/f03-suffix.f03
flang/test/Driver/supported-suffices/f08-suffix.f08
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/ieee_is_normal.f90
flang/test/Lower/Intrinsics/isnan.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/Todo/omp-declare-target.f90
flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
flang/test/Lower/dummy-argument-optional.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -88,14 +88,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -104,7 +105,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@ -24,13 +24,13 @@
Fortran_main
)
-target_link_libraries(flang-new
+target_link_libraries(flang
PRIVATE
flangFrontend
flangFrontendTool
)
-clang_target_link_libraries(flang-new
+clang_target_link_libraries(flang
PRIVATE
clangDriver
clangBasic
@@ -38,9 +38,9 @@
option(FLANG_PLUGIN_SUPPORT "Build Flang with plugin support." ON)
-# Enable support for plugins, which need access to symbols from flang-new
+# Enable support for plugins, which need access to symbols from flang
if(FLANG_PLUGIN_SUPPORT)
- export_executable_symbols_for_plugins(flang-new)
+ export_executable_symbols_for_plugins(flang)
endif()
-install(TARGETS
[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional updated this revision to Diff 507472.
everythingfunctional added a comment.
Herald added subscribers: jplehr, ormris, steven_wu, hiraditya.
Address conflicts with main branch and fix new tests
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143592/new/
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/lto-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/omp-frontend-forwarding.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/supported-suffices/f03-suffix.f03
flang/test/Driver/supported-suffices/f08-suffix.f08
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/ieee_is_normal.f90
flang/test/Lower/Intrinsics/isnan.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/Todo/omp-declare-target.f90
flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90
flang/test/Lower/dummy-argument-optional.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -88,14 +88,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -104,7 +105,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@ -24,13 +24,13 @@
Fortran_main
)
-target_link_libraries(flang-new
+target_link_libraries(flang
PRIVATE
flangFrontend
flangFrontendTool
)
-clang_target_link_libraries(flang-new
+clang_target_link_libraries(flang
PRIVATE
clangDriver
clangBasic
@@ -38,9 +38,9 @@
option(FLANG_PLUGIN_SUPPORT "Build Flang with plugin support." ON)
-# Enable support for plugins, which need access to symbols from flang-new
+# Enable support for plugins, which need access to symbols from flang
if(FLANG_PLUGIN_SUPPORT)
- export_executable_symbols_for_plugins(flang-new)
+
[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional updated this revision to Diff 496213.
everythingfunctional added a comment.
rebase to get fix for build/test failure
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143592/new/
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/Todo/omp-declare-target.f90
flang/test/Lower/OpenMP/omp-parallel-lastprivate-clause-scalar.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -88,14 +88,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -104,7 +105,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@ -24,13 +24,13 @@
Fortran_main
)
-target_link_libraries(flang-new
+target_link_libraries(flang
PRIVATE
flangFrontend
flangFrontendTool
)
-clang_target_link_libraries(flang-new
+clang_target_link_libraries(flang
PRIVATE
clangDriver
clangBasic
@@ -38,9 +38,9 @@
option(FLANG_PLUGIN_SUPPORT "Build Flang with plugin support." ON)
-# Enable support for plugins, which need access to symbols from flang-new
+# Enable support for plugins, which need access to symbols from flang
if(FLANG_PLUGIN_SUPPORT)
- export_executable_symbols_for_plugins(flang-new)
+ export_executable_symbols_for_plugins(flang)
endif()
-install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS flang DESTINATION "${CMAKE_INSTALL_BINDIR}")
Index: flang/tools/f18/flang-to-external-fc.in
===
--- flang/tools/f18/flang-to-external-fc.in
+++ flang/tools/f18/flang-to-external-fc.in
@@ -205,7 +205,7 @@
[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional updated this revision to Diff 495940.
everythingfunctional added a comment.
Fix the flang program path
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143592/new/
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/Todo/omp-declare-target.f90
flang/test/Lower/OpenMP/omp-parallel-lastprivate-clause-scalar.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -88,14 +88,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -104,7 +105,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@ -24,13 +24,13 @@
Fortran_main
)
-target_link_libraries(flang-new
+target_link_libraries(flang
PRIVATE
flangFrontend
flangFrontendTool
)
-clang_target_link_libraries(flang-new
+clang_target_link_libraries(flang
PRIVATE
clangDriver
clangBasic
@@ -38,9 +38,9 @@
option(FLANG_PLUGIN_SUPPORT "Build Flang with plugin support." ON)
-# Enable support for plugins, which need access to symbols from flang-new
+# Enable support for plugins, which need access to symbols from flang
if(FLANG_PLUGIN_SUPPORT)
- export_executable_symbols_for_plugins(flang-new)
+ export_executable_symbols_for_plugins(flang)
endif()
-install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS flang DESTINATION "${CMAKE_INSTALL_BINDIR}")
Index: flang/tools/f18/flang-to-external-fc.in
===
--- flang/tools/f18/flang-to-external-fc.in
+++ flang/tools/f18/flang-to-external-fc.in
@@ -205,7 +205,7 @@
if
[PATCH] D143592: [flang][driver] Rename `flang-new -flang-experimental-exec` to `flang`
everythingfunctional created this revision.
everythingfunctional added reviewers: ktras, rouson, awarzynski,
CarolineConcatto, rovka, stuartellis, tarunprabhu, mnadeem, PeteSteinfeld,
peixin, clementval, jpenix-quic, ekieri, FarisRehman, arnamoy10, DavidTruby,
mstorsjo, Ericson2314, klausler, sscalpone, kiranchandramohan, kiranktp,
richard.barton.arm, jdoerfert, Leporacanthicus, dpalermo, schweitz, shraiysh,
h-vetinari, DavidSpickett, pmccormick, hussainjk.
everythingfunctional added projects: Flang, LLVM.
Herald added a subscriber: sunshaoce.
Herald added a project: All.
everythingfunctional requested review of this revision.
Herald added subscribers: cfe-commits, sstefan1, MaskRay.
Herald added a project: clang.
This patch renames the `flang-new` executable to just `flang`, and drops the
need for the special flag `-flang-experimental-exec`. Thus, building flang
makes the executable `flang` available as a usable compiler.
For reference, this was proposed nearly a year ago in
https://reviews.llvm.org/D125788 and has received some new discussion and
support in
https://discourse.llvm.org/t/reviving-rename-flang-new-to-flang/68130.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D143592
Files:
clang/include/clang/Driver/Options.td
clang/lib/Driver/Driver.cpp
clang/lib/Driver/ToolChains/CommonArgs.cpp
clang/lib/Driver/ToolChains/Flang.cpp
clang/test/Driver/flang/flang.f90
clang/test/Driver/flang/flang_ucase.F90
clang/test/Driver/flang/multiple-inputs-mixed.f90
clang/test/Driver/flang/multiple-inputs.f90
flang/docs/FlangDriver.md
flang/docs/ImplementingASemanticCheck.md
flang/docs/Overview.md
flang/examples/FlangOmpReport/FlangOmpReport.cpp
flang/lib/Frontend/CompilerInvocation.cpp
flang/lib/Frontend/FrontendActions.cpp
flang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
flang/test/CMakeLists.txt
flang/test/Driver/color-diagnostics-forwarding.f90
flang/test/Driver/convert.f90
flang/test/Driver/disable-ext-name-interop.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/driver-version.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/frontend-forwarding.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/linker-flags.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/missing-input.f90
flang/test/Driver/multiple-input-files.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/use-module-error.f90
flang/test/Driver/use-module.f90
flang/test/Lower/Intrinsics/command_argument_count.f90
flang/test/Lower/Intrinsics/exit.f90
flang/test/Lower/Intrinsics/get_command_argument.f90
flang/test/Lower/Intrinsics/get_environment_variable.f90
flang/test/Lower/Intrinsics/move_alloc.f90
flang/test/Lower/OpenACC/Todo/acc-declare.f90
flang/test/Lower/OpenACC/Todo/acc-routine.f90
flang/test/Lower/OpenMP/Todo/omp-declarative-allocate.f90
flang/test/Lower/OpenMP/Todo/omp-declare-reduction.f90
flang/test/Lower/OpenMP/Todo/omp-declare-simd.f90
flang/test/Lower/OpenMP/Todo/omp-declare-target.f90
flang/test/Lower/OpenMP/omp-parallel-lastprivate-clause-scalar.f90
flang/test/lit.cfg.py
flang/tools/f18/CMakeLists.txt
flang/tools/f18/flang-to-external-fc.in
flang/tools/flang-driver/CMakeLists.txt
flang/tools/flang-driver/driver.cpp
Index: flang/tools/flang-driver/driver.cpp
===
--- flang/tools/flang-driver/driver.cpp
+++ flang/tools/flang-driver/driver.cpp
@@ -88,14 +88,15 @@
llvm::InitLLVM x(argc, argv);
llvm::SmallVector args(argv, argv + argc);
- clang::driver::ParsedClangName targetandMode("flang", "--driver-mode=flang");
+ clang::driver::ParsedClangName targetandMode =
+ clang::driver::ToolChain::getTargetAndModeFromProgramName(argv[0]);
std::string driverPath = getExecutablePath(args[0]);
llvm::BumpPtrAllocator a;
llvm::StringSaver saver(a);
ExpandResponseFiles(saver, args);
- // Check if flang-new is in the frontend mode
+ // Check if flang is in the frontend mode
auto firstArg = std::find_if(args.begin() + 1, args.end(),
[](const char *a) { return a != nullptr; });
if (firstArg != args.end()) {
@@ -104,7 +105,7 @@
<< "Valid tools include '-fc1'.\n";
return 1;
}
-// Call flang-new frontend
+// Call flang frontend
if (llvm::StringRef(args[1]).startswith("-fc1")) {
return executeFC1Tool(args);
}
Index: flang/tools/flang-driver/CMakeLists.txt
===
--- flang/tools/flang-driver/CMakeLists.txt
+++ flang/tools/flang-driver/CMakeLists.txt
@@ -11,7 +11,7 @@
TargetParser
)
-add_flang_tool(flang-new
+add_flang_tool(flang
driver.cpp
fc1_main.cpp
@@
