commit 46420b6feedc96790a80f1447f4b819ca5d67800
author Erik Pilkington <erik.pilkington@gmail.com> Thu Sep 27 20:36:28 2018 +0000
committer Erik Pilkington <erik.pilkington@gmail.com> Thu Sep 27 20:36:28 2018 +0000
tree 1514c3995239017bf8b166b1f8a43e0c00cd04f5
parent 01bb2baaa1c97b951b477e871cbde9572fadc056

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

llvm-svn: 343263

clang/lib/Driver/CMakeLists.txt

diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
index 2b03c9f..1e6122e 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -57,7 +57,7 @@
   ToolChains/NetBSD.cpp
   ToolChains/OpenBSD.cpp
   ToolChains/PS4CPU.cpp
-  ToolChains/RISCV.cpp
+  ToolChains/RISCVToolchain.cpp
   ToolChains/Solaris.cpp
   ToolChains/TCE.cpp
   ToolChains/WebAssembly.cpp

clang/lib/Driver/Driver.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 8266f92..d356983 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"

clang/lib/Driver/ToolChains/RISCVToolchain.cpp

diff --git a/clang/lib/Driver/ToolChains/RISCV.cpp b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp
similarity index 97%
rename from clang/lib/Driver/ToolChains/RISCV.cpp
rename to clang/lib/Driver/ToolChains/RISCVToolchain.cpp
index 22195a6..e787c82 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"

clang/lib/Driver/ToolChains/RISCVToolchain.h

diff --git a/clang/lib/Driver/ToolChains/RISCV.h b/clang/lib/Driver/ToolChains/RISCVToolchain.h
similarity index 88%
rename from clang/lib/Driver/ToolChains/RISCV.h
rename to clang/lib/Driver/ToolChains/RISCVToolchain.h
index c0625c4..4b38690 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 @@
 } // end namespace driver
 } // end namespace clang
 
-#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCV_H
+#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_RISCVTOOLCHAIN_H