[lld] r190332 - Rename GnuLDInputGraph.h -> GnuLdInputGraph.h for consistency with other files.

Rui Ueyama ruiu at google.com
Mon Sep 9 12:30:23 PDT 2013


Author: ruiu
Date: Mon Sep  9 14:30:23 2013
New Revision: 190332

URL: http://llvm.org/viewvc/llvm-project?rev=190332&view=rev
Log:
Rename GnuLDInputGraph.h -> GnuLdInputGraph.h for consistency with other files.

Added:
    lld/trunk/include/lld/Driver/GnuLdInputGraph.h
      - copied, changed from r190329, lld/trunk/include/lld/Driver/GnuLDInputGraph.h
Removed:
    lld/trunk/include/lld/Driver/GnuLDInputGraph.h
Modified:
    lld/trunk/lib/Driver/GnuLdDriver.cpp

Removed: lld/trunk/include/lld/Driver/GnuLDInputGraph.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/GnuLDInputGraph.h?rev=190331&view=auto
==============================================================================
--- lld/trunk/include/lld/Driver/GnuLDInputGraph.h (original)
+++ lld/trunk/include/lld/Driver/GnuLDInputGraph.h (removed)
@@ -1,112 +0,0 @@
-//===- lld/Driver/GnuLDInputGraph.h - Files to be linked for ELF linking---===//
-//
-//                             The LLVM Linker
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-///
-/// Handles Options for the GNU style linker for ELF and provides InputElements
-/// for the GNU style linker for ELF
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLD_ELF_INPUT_GRAPH_H
-#define LLD_ELF_INPUT_GRAPH_H
-
-#include "lld/Driver/InputGraph.h"
-#include "lld/ReaderWriter/ELFLinkingContext.h"
-
-namespace lld {
-
-/// \brief Represents a ELF File
-class ELFFileNode : public FileNode {
-public:
-  ELFFileNode(ELFLinkingContext &ctx, StringRef path,
-              std::vector<StringRef> searchPath, bool isWholeArchive = false,
-              bool asNeeded = false, bool dashlPrefix = false)
-      : FileNode(path), _elfLinkingContext(ctx),
-        _isWholeArchive(isWholeArchive), _asNeeded(asNeeded),
-        _isDashlPrefix(dashlPrefix) {
-    std::copy(searchPath.begin(), searchPath.end(),
-              std::back_inserter(_libraryPaths));
-  }
-
-  static inline bool classof(const InputElement *a) {
-    return a->kind() == InputElement::Kind::File;
-  }
-
-  virtual llvm::ErrorOr<StringRef> path(const LinkingContext &ctx) const;
-
-  virtual llvm::ErrorOr<std::unique_ptr<lld::LinkerInput> >
-  createLinkerInput(const lld::LinkingContext &);
-
-  /// \brief validates the Input Element
-  virtual bool validate() { return true; }
-
-  /// \brief create an error string for printing purposes
-  virtual std::string errStr(llvm::error_code);
-
-  /// \brief Dump the Input Element
-  virtual bool dump(raw_ostream &diagnostics) {
-    diagnostics << "Name    : " << *path(_elfLinkingContext) << "\n";
-    diagnostics << "Type    : "
-                << "ELF File"
-                << "\n";
-    diagnostics << "Ordinal : " << getOrdinal() << "\n";
-    diagnostics << "Attributes : "
-                << "\n";
-    diagnostics << "  - wholeArchive : "
-                << ((_isWholeArchive) ? "true" : "false") << "\n";
-    diagnostics << "  - asNeeded : " << ((_asNeeded) ? "true" : "false")
-                << "\n";
-    diagnostics << "  contextPath : " << ((_libraryPaths.size()) ? "" : "None")
-                << "\n";
-    for (auto path : _libraryPaths)
-      diagnostics << "    - " << path << "\n";
-    return true;
-  }
-
-private:
-  llvm::BumpPtrAllocator _alloc;
-  ELFLinkingContext &_elfLinkingContext;
-  bool _isWholeArchive;
-  bool _asNeeded;
-  bool _isDashlPrefix;
-  std::vector<StringRef> _libraryPaths;
-};
-
-/// \brief Represents a ELF control node
-class ELFGroup : public Group {
-public:
-  ELFGroup(ELFLinkingContext &ctx) : Group(), _elfLinkingContext(ctx) {}
-
-  static inline bool classof(const InputElement *a) {
-    return a->kind() == InputElement::Kind::Control;
-  }
-
-  virtual llvm::ErrorOr<std::unique_ptr<lld::LinkerInput> >
-  createLinkerInput(const lld::LinkingContext &) {
-    // FIXME : create a linker input to handle groups
-    return llvm::make_error_code(llvm::errc::no_such_file_or_directory);
-  }
-
-  /// \brief Validate the options
-  virtual bool validate() {
-    (void)_elfLinkingContext;
-    return true;
-  }
-
-  /// \brief Dump the ELFGroup
-  virtual bool dump(llvm::raw_ostream &) { return true; }
-
-private:
-  ELFLinkingContext &_elfLinkingContext;
-};
-
-} // namespace lld
-
-#endif

Copied: lld/trunk/include/lld/Driver/GnuLdInputGraph.h (from r190329, lld/trunk/include/lld/Driver/GnuLDInputGraph.h)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/GnuLdInputGraph.h?p2=lld/trunk/include/lld/Driver/GnuLdInputGraph.h&p1=lld/trunk/include/lld/Driver/GnuLDInputGraph.h&r1=190329&r2=190332&rev=190332&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/GnuLDInputGraph.h (original)
+++ lld/trunk/include/lld/Driver/GnuLdInputGraph.h Mon Sep  9 14:30:23 2013
@@ -1,4 +1,4 @@
-//===- lld/Driver/GnuLDInputGraph.h - Files to be linked for ELF linking---===//
+//===- lld/Driver/GnuLdInputGraph.h - Files to be linked for ELF linking---===//
 //
 //                             The LLVM Linker
 //

Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=190332&r1=190331&r2=190332&view=diff
==============================================================================
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Mon Sep  9 14:30:23 2013
@@ -14,7 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "lld/Driver/Driver.h"
-#include "lld/Driver/GnuLDInputGraph.h"
+#include "lld/Driver/GnuLdInputGraph.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"





More information about the llvm-commits mailing list