diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-09-27 20:36:28 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-09-27 20:36:28 +0000 |
| commit | a337eec5f1585a39769b4e06c184e5db635b1fef (patch) | |
| tree | f16fee7728250c8e440b1d4fe03822862821f900 | |
| parent | 3bf03f083073d09f717dd8ab3b24384ed5ad19b7 (diff) | |
NFC: Fix some darwin linker warnings introduced in r338385
The darwin linker was complaining about Toolchains/RISCV.cpp and
Toolchains/Arch/RISCV.cpp had the same name. Fix is to just rename
Toolchains/RISCV.cpp to Toolchains/RISCVToolchain.cpp.
Differential revision: https://reviews.llvm.org/D52574
| -rw-r--r-- | clang/lib/Driver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/RISCVToolchain.cpp (renamed from clang/lib/Driver/ToolChains/RISCV.cpp) | 4 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/RISCVToolchain.h (renamed from clang/lib/Driver/ToolChains/RISCV.h) | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt index 2b03c9f7001..1e6122e98c8 100644 --- a/clang/lib/Driver/CMakeLists.txt +++ b/clang/lib/Driver/CMakeLists.txt @@ -57,7 +57,7 @@ add_clang_library(clangDriver ToolChains/NetBSD.cpp ToolChains/OpenBSD.cpp ToolChains/PS4CPU.cpp - ToolChains/RISCV.cpp + ToolChains/RISCVToolchain.cpp ToolChains/Solaris.cpp ToolChains/TCE.cpp ToolChains/WebAssembly.cpp diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 8266f92a3ad..d3569836e0e 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -37,7 +37,7 @@ #include "ToolChains/NetBSD.h" #include "ToolChains/OpenBSD.h" #include "ToolChains/PS4CPU.h" -#include "ToolChains/RISCV.h" +#include "ToolChains/RISCVToolchain.h" #include "ToolChains/Solaris.h" #include "ToolChains/TCE.h" #include "ToolChains/WebAssembly.h" diff --git a/clang/lib/Driver/ToolChains/RISCV.cpp b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp index 22195a69573..e787c82b28a 100644 --- a/clang/lib/Driver/ToolChains/RISCV.cpp +++ b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp @@ -1,4 +1,4 @@ -//===--- RISCV.cpp - RISCV ToolChain Implementations ------------*- C++ -*-===// +//===--- RISCVToolchain.cpp - RISCV ToolChain Implementations ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "RISCV.h" +#include "RISCVToolchain.h" #include "CommonArgs.h" #include "InputInfo.h" #include "clang/Driver/Compilation.h" diff --git a/clang/lib/Driver/ToolChains/RISCV.h b/clang/lib/Driver/ToolChains/RISCVToolchain.h index c0625c4dbcf..4b38690b1b6 100644 --- a/clang/lib/Driver/ToolChains/RISCV.h +++ b/clang/lib/Driver/ToolChains/RISCVToolchain.h @@ -1,4 +1,4 @@ -//===--- RISCV.h - RISCV ToolChain Implementations --------------*- C++ -*-===// +//===--- RISCVToolchain.h - RISCV ToolChain Implementations -----*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCV_H -#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCV_H +#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCVTOOLCHAIN_H +#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCVTOOLCHAIN_H #include "Gnu.h" #include "clang/Driver/ToolChain.h" @@ -60,4 +60,4 @@ public: } // end namespace driver } // end namespace clang -#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCV_H +#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCVTOOLCHAIN_H |