commit 37b74a387bb3993387029859c2d9d051c41c724e
author Stephen Hines <srhines@google.com> Wed Nov 26 18:48:20 2014 -0800
committer Stephen Hines <srhines@google.com> Wed Nov 26 18:49:58 2014 -0800
tree a2a5b611b47a82624fe31dc457d12533a3aaaed6
parent dfd6c08c66b4b3d58fd28b5376478381e1a5647a

Update mclinker for LLVM rebase to r222494.

This corresponds to the following upstream mclinker change:

commit b2f1691276052c4215abf36715d43248d6337cf8
Author: Diana Chen <mysekki@gmail.com>
Date:   Tue Nov 25 14:03:29 2014 +0800

    option: Allow `-hash-style' can be specified zero or more times

Change-Id: I332546680bb45cf9692adfa2c2d3dcdc84361afc

lib/MC/MCLDDirectory.cpp

diff --git a/lib/MC/MCLDDirectory.cpp b/lib/MC/MCLDDirectory.cpp
index a15e744..5d281d5 100644
--- a/lib/MC/MCLDDirectory.cpp
+++ b/lib/MC/MCLDDirectory.cpp
@@ -6,99 +6,93 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#include <mcld/MC/MCLDDirectory.h>
-#include <mcld/Support/FileSystem.h>
+#include "mcld/MC/MCLDDirectory.h"
+#include "mcld/Support/FileSystem.h"
 
-using namespace mcld;
-using namespace mcld::sys::fs;
+namespace mcld {
 
 //===----------------------------------------------------------------------===//
 // MCLDDirectory
 //===----------------------------------------------------------------------===//
-MCLDDirectory::MCLDDirectory()
-  : Directory(), m_Name(), m_bInSysroot(false) {
+MCLDDirectory::MCLDDirectory() : Directory(), m_Name(), m_bInSysroot(false) {
 }
 
-MCLDDirectory::MCLDDirectory(const char* pName)
-  : Directory(), m_Name(pName) {
+MCLDDirectory::MCLDDirectory(const char* pName) : Directory(), m_Name(pName) {
   Directory::m_Path.assign(pName);
 
   if (!Directory::m_Path.empty())
-    m_bInSysroot = ('=' == Directory::m_Path.native()[0]);
+    m_bInSysroot = (Directory::m_Path.native()[0] == '=');
 
   Directory::m_Path.m_append_separator_if_needed();
   if (m_bInSysroot)
     Directory::m_Path.native().erase(Directory::m_Path.native().begin());
   else
-    detail::open_dir(*this);
+    sys::fs::detail::open_dir(*this);
 }
 
-MCLDDirectory::MCLDDirectory(const std::string &pName)
-  : Directory(), m_Name(pName) {
+MCLDDirectory::MCLDDirectory(const std::string& pName)
+    : Directory(), m_Name(pName) {
   Directory::m_Path.assign(pName);
 
   if (!Directory::m_Path.empty())
-    m_bInSysroot = ('=' == Directory::m_Path.native()[0]);
+    m_bInSysroot = (Directory::m_Path.native()[0] == '=');
 
   Directory::m_Path.m_append_separator_if_needed();
   if (m_bInSysroot)
     Directory::m_Path.native().erase(Directory::m_Path.native().begin());
   else
-    detail::open_dir(*this);
+    sys::fs::detail::open_dir(*this);
 }
 
 MCLDDirectory::MCLDDirectory(llvm::StringRef pName)
-  : Directory(), m_Name(pName.data(), pName.size()) {
+    : Directory(), m_Name(pName.data(), pName.size()) {
   Directory::m_Path.assign(pName.str());
 
   if (!Directory::m_Path.empty())
-    m_bInSysroot = ('=' == Directory::m_Path.native()[0]);
+    m_bInSysroot = (Directory::m_Path.native()[0] == '=');
 
   Directory::m_Path.m_append_separator_if_needed();
   if (m_bInSysroot)
     Directory::m_Path.native().erase(Directory::m_Path.native().begin());
   else
-    detail::open_dir(*this);
+    sys::fs::detail::open_dir(*this);
 }
 
-MCLDDirectory &MCLDDirectory::assign(llvm::StringRef pName)
-{
+MCLDDirectory& MCLDDirectory::assign(llvm::StringRef pName) {
   m_Name.assign(pName.data(), pName.size());
   Directory::m_Path.assign(pName.str());
 
   if (!Directory::m_Path.empty())
-    m_bInSysroot = ('=' == Directory::m_Path.native()[0]);
+    m_bInSysroot = (Directory::m_Path.native()[0] == '=');
 
   Directory::m_Path.m_append_separator_if_needed();
   if (m_bInSysroot)
     Directory::m_Path.native().erase(Directory::m_Path.native().begin());
   else
-    detail::open_dir(*this);
-  Directory::m_FileStatus = FileStatus();
-  Directory::m_SymLinkStatus = FileStatus();
+    sys::fs::detail::open_dir(*this);
+  Directory::m_FileStatus = sys::fs::FileStatus();
+  Directory::m_SymLinkStatus = sys::fs::FileStatus();
   Directory::m_Cache.clear();
   Directory::m_Handler = 0;
   return (*this);
 }
 
-MCLDDirectory::~MCLDDirectory()
-{
+MCLDDirectory::~MCLDDirectory() {
 }
 
-bool MCLDDirectory::isInSysroot() const
-{
+bool MCLDDirectory::isInSysroot() const {
   return m_bInSysroot;
 }
 
-void MCLDDirectory::setSysroot(const sys::fs::Path& pSysroot)
-{
+void MCLDDirectory::setSysroot(const sys::fs::Path& pSysroot) {
   if (m_bInSysroot) {
     std::string old_path = Directory::m_Path.native();
     Directory::m_Path.native() = pSysroot.native();
     Directory::m_Path.m_append_separator_if_needed();
     Directory::m_Path.native() += old_path;
-    detail::canonicalize(Directory::m_Path.native());
-    detail::open_dir(*this);
+    sys::fs::detail::canonicalize(Directory::m_Path.native());
+    sys::fs::detail::open_dir(*this);
   }
 }
 
+}  // namespace mcld