Undo the change to override getCompilerRT in AIX.cpp as it alters clang.

Author: DanielCChen

clang/lib/Driver/ToolChain.cpp

@@ -782,6 +782,9 @@ std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component,
       Path = P;
   }
 
+  if (getTriple().isOSAIX())
+    Path.clear();
+
   // Check the filename for the old layout if the new one does not exist.
   CRTBasename = buildCompilerRTBasename(Args, Component, Type,
                                         /*AddArch=*/!IsFortran, IsFortran);

clang/lib/Driver/ToolChains/AIX.cpp

@@ -16,7 +16,6 @@
 #include "llvm/Option/ArgList.h"
 #include "llvm/ProfileData/InstrProf.h"
 #include "llvm/Support/Path.h"
-#include "llvm/Support/VirtualFileSystem.h"
 
 #include <set>
 
@@ -609,18 +608,6 @@ void AIX::addProfileRTLibs(const llvm::opt::ArgList &Args,
   ToolChain::addProfileRTLibs(Args, CmdArgs);
 }
 
-std::string AIX::getCompilerRT(const ArgList &Args, StringRef Component,
-                               FileType Type, bool IsFortran) const {
-  // On AIX, build the filename for the layout as if
-  // LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF (e.g. lib/${os_dirname})
-  std::string CRTBasename =
-      buildCompilerRTBasename(Args, Component, Type,
-                              /*AddArch=*/!IsFortran, IsFortran);
-  SmallString<128> Path(getCompilerRTPath());
-  llvm::sys::path::append(Path, CRTBasename);
-  return std::string(Path);
-}
-
 void AIX::addFortranRuntimeLibs(const ArgList &Args,
                                 llvm::opt::ArgStringList &CmdArgs) const {
   // Link flang_rt.runtime.a. On AIX, the static and shared library are all

clang/lib/Driver/ToolChains/AIX.h

@@ -87,10 +87,6 @@ class LLVM_LIBRARY_VISIBILITY AIX : public ToolChain {
   void addProfileRTLibs(const llvm::opt::ArgList &Args,
                         llvm::opt::ArgStringList &CmdArgs) const override;
 
-  std::string getCompilerRT(const llvm::opt::ArgList &Args, StringRef Component,
-                            FileType Type = ToolChain::FT_Static,
-                            bool IsFortran = false) const override;
-
   void addFortranRuntimeLibs(const llvm::opt::ArgList &Args,
                              llvm::opt::ArgStringList &CmdArgs) const override;