Skip to content

Commit ed00432

Browse files
committed
[flang-new -> flang] Review comments
1 parent 720c2ed commit ed00432

File tree

5 files changed

+2
-15
lines changed

5 files changed

+2
-15
lines changed

clang/lib/Driver/ToolChain.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,6 @@ static const DriverSuffix *FindDriverSuffix(StringRef ProgName, size_t &Pos) {
428428
{"cl", "--driver-mode=cl"},
429429
{"++", "--driver-mode=g++"},
430430
{"flang", "--driver-mode=flang"},
431-
// For backwards compatibility, we create a symlink for `flang` called
432-
// `flang`. This will be removed in the future.
433-
{"flang", "--driver-mode=flang"},
434431
{"clang-dxc", "--driver-mode=dxc"},
435432
};
436433

clang/tools/amdllvm/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ add_clang_tool(amdllvm
66
amdllvm.cpp
77
)
88

9-
option(CLANG_LINK_FLANG "Create flang install link to clang" ON)
10-
119
list(APPEND CLANG_LINKS_TO_CREATE clang clang++ clang-cl clang-cpp clang-${CLANG_VERSION_MAJOR} lld)
1210

13-
if(CLANG_LINK_FLANG)
14-
list(APPEND CLANG_LINKS_TO_CREATE flang flang)
15-
endif()
16-
1711
foreach(link ${CLANG_LINKS_TO_CREATE})
1812
add_clang_symlink("amd${link}" amdllvm)
1913
endforeach()

flang-rt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../flang")
2727
# LLVM's requirement is only CMake 3.20, teach CMake 3.20-3.23 how to use Flang.
2828
if (CMAKE_VERSION VERSION_LESS "3.24")
2929
cmake_path(GET CMAKE_Fortran_COMPILER STEM _Fortran_COMPILER_STEM)
30-
if (_Fortran_COMPILER_STEM STREQUAL "flang" OR _Fortran_COMPILER_STEM STREQUAL "flang")
30+
if (_Fortran_COMPILER_STEM STREQUAL "flang")
3131
include(CMakeForceCompiler)
3232
CMAKE_FORCE_Fortran_COMPILER("${CMAKE_Fortran_COMPILER}" "LLVMFlang")
3333

flang/include/flang/Optimizer/Analysis/AliasAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct AliasAnalysis {
6666
// a(1) = 1
6767
// end subroutine
6868
// -------------------------------------------------
69-
//
69+
//
7070
// flang -fc1 -emit-fir test.f90 -o test.fir
7171
//
7272
// ------------------- test.fir --------------------

flang/test/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ set(FLANG_TEST_PARAMS
5959

6060
set(FLANG_TEST_DEPENDS
6161
flang
62-
llvm-config
63-
FileCheck
64-
count
65-
not
6662
module_files
6763
fir-opt
6864
tco

0 commit comments

Comments
 (0)