[llvm-commits] [lld] r153590 - in /lld/trunk: include/lld/Core/Atom.h include/lld/Core/DefinedAtom.h include/lld/Core/File.h include/lld/Core/NativeReader.h include/lld/Core/Pass.h include/lld/Core/Platform.h include/lld/Core/Resolver.h include/lld/Core/SymbolTable.h include/lld/Core/YamlReader.h lib/Core/NativeReader.cpp lib/Core/NativeWriter.cpp lib/Core/Resolver.cpp lib/Core/SymbolTable.cpp lib/Core/YamlKeyValues.cpp lib/Core/YamlReader.cpp lib/Core/YamlWriter.cpp lib/Passes/GOTPass.cpp lib/Passes/StubsPass.cpp

Michael J. Spencer bigcheesegs at gmail.com
Wed Mar 28 12:04:03 PDT 2012


Author: mspencer
Date: Wed Mar 28 14:04:02 2012
New Revision: 153590

URL: http://llvm.org/viewvc/llvm-project?rev=153590&view=rev
Log:
Rearange header order to match llvm style. This exposed some missing types.
Also fix some Platform.h includes that somehow got missed last time.

Modified:
    lld/trunk/include/lld/Core/Atom.h
    lld/trunk/include/lld/Core/DefinedAtom.h
    lld/trunk/include/lld/Core/File.h
    lld/trunk/include/lld/Core/NativeReader.h
    lld/trunk/include/lld/Core/Pass.h
    lld/trunk/include/lld/Core/Platform.h
    lld/trunk/include/lld/Core/Resolver.h
    lld/trunk/include/lld/Core/SymbolTable.h
    lld/trunk/include/lld/Core/YamlReader.h
    lld/trunk/lib/Core/NativeReader.cpp
    lld/trunk/lib/Core/NativeWriter.cpp
    lld/trunk/lib/Core/Resolver.cpp
    lld/trunk/lib/Core/SymbolTable.cpp
    lld/trunk/lib/Core/YamlKeyValues.cpp
    lld/trunk/lib/Core/YamlReader.cpp
    lld/trunk/lib/Core/YamlWriter.cpp
    lld/trunk/lib/Passes/GOTPass.cpp
    lld/trunk/lib/Passes/StubsPass.cpp

Modified: lld/trunk/include/lld/Core/Atom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Atom.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Atom.h (original)
+++ lld/trunk/include/lld/Core/Atom.h Wed Mar 28 14:04:02 2012
@@ -10,7 +10,9 @@
 #ifndef LLD_CORE_ATOM_H_
 #define LLD_CORE_ATOM_H_
 
-#include <assert.h>
+#include "llvm/Support/DataTypes.h"
+
+#include <cassert>
 
 namespace llvm {
   class StringRef;

Modified: lld/trunk/include/lld/Core/DefinedAtom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/DefinedAtom.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/DefinedAtom.h (original)
+++ lld/trunk/include/lld/Core/DefinedAtom.h Wed Mar 28 14:04:02 2012
@@ -10,8 +10,6 @@
 #ifndef LLD_CORE_DEFINED_ATOM_H_
 #define LLD_CORE_DEFINED_ATOM_H_
 
-#include <assert.h>
-
 #include "lld/Core/Atom.h"
 #include "lld/Core/Reference.h"
 

Modified: lld/trunk/include/lld/Core/File.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/File.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/File.h (original)
+++ lld/trunk/include/lld/Core/File.h Wed Mar 28 14:04:02 2012
@@ -10,14 +10,14 @@
 #ifndef LLD_CORE_FILE_H_
 #define LLD_CORE_FILE_H_
 
-#include <vector>
+#include "lld/Core/AbsoluteAtom.h"
+#include "lld/Core/DefinedAtom.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/UndefinedAtom.h"
 
 #include "llvm/ADT/StringRef.h"
 
-#include "lld/Core/DefinedAtom.h"
-#include "lld/Core/UndefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
-#include "lld/Core/AbsoluteAtom.h"
+#include <vector>
 
 namespace lld {
 

Modified: lld/trunk/include/lld/Core/NativeReader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/NativeReader.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/NativeReader.h (original)
+++ lld/trunk/include/lld/Core/NativeReader.h Wed Mar 28 14:04:02 2012
@@ -13,7 +13,6 @@
 #include "lld/Core/File.h"
 
 #include "llvm/ADT/OwningPtr.h"
-
 #include "llvm/Support/system_error.h"
 
 #include <vector>

Modified: lld/trunk/include/lld/Core/Pass.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Pass.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Pass.h (original)
+++ lld/trunk/include/lld/Core/Pass.h Wed Mar 28 14:04:02 2012
@@ -10,11 +10,11 @@
 #ifndef LLD_CORE_PASS_H_
 #define LLD_CORE_PASS_H_
 
-#include <vector>
-
 #include "lld/Core/Atom.h"
 #include "lld/Core/Platform.h"
 
+#include <vector>
+
 namespace lld {
 
 

Modified: lld/trunk/include/lld/Core/Platform.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Platform.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Platform.h (original)
+++ lld/trunk/include/lld/Core/Platform.h Wed Mar 28 14:04:02 2012
@@ -10,10 +10,10 @@
 #ifndef LLD_CORE_PLATFORM_H_
 #define LLD_CORE_PLATFORM_H_
 
-#include <vector>
-
 #include "lld/Core/Reference.h"
 
+#include <vector>
+
 namespace lld {
 class Atom;
 class DefinedAtom;

Modified: lld/trunk/include/lld/Core/Resolver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Resolver.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Resolver.h (original)
+++ lld/trunk/include/lld/Core/Resolver.h Wed Mar 28 14:04:02 2012
@@ -16,8 +16,8 @@
 
 #include "llvm/ADT/DenseSet.h"
 
-#include <vector>
 #include <set>
+#include <vector>
 
 namespace lld {
 

Modified: lld/trunk/include/lld/Core/SymbolTable.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/SymbolTable.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/SymbolTable.h (original)
+++ lld/trunk/include/lld/Core/SymbolTable.h Wed Mar 28 14:04:02 2012
@@ -10,14 +10,13 @@
 #ifndef LLD_CORE_SYMBOL_TABLE_H_
 #define LLD_CORE_SYMBOL_TABLE_H_
 
-#include <cstring>
-#include <map>
-#include <vector>
-
-#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringRef.h"
 
+#include <cstring>
+#include <map>
+#include <vector>
 
 namespace lld {
 

Modified: lld/trunk/include/lld/Core/YamlReader.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/YamlReader.h?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/YamlReader.h (original)
+++ lld/trunk/include/lld/Core/YamlReader.h Wed Mar 28 14:04:02 2012
@@ -14,7 +14,10 @@
 
 #include <vector>
 
-namespace llvm { class MemoryBuffer; }
+namespace llvm {
+class MemoryBuffer;
+class StringRef;
+}
 
 namespace lld {
 

Modified: lld/trunk/lib/Core/NativeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/NativeReader.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/NativeReader.cpp (original)
+++ lld/trunk/lib/Core/NativeReader.cpp Wed Mar 28 14:04:02 2012
@@ -7,9 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <vector>
+#include "NativeFileFormat.h"
 
-#include <assert.h>
+#include "lld/Core/Atom.h"
+#include "lld/Core/Error.h"
+#include "lld/Core/File.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/OwningPtr.h"
@@ -17,11 +19,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MemoryBuffer.h"
 
-#include "lld/Core/Error.h"
-#include "lld/Core/File.h"
-#include "lld/Core/Atom.h"
-
-#include "NativeFileFormat.h"
+#include <vector>
 
 namespace lld {
 

Modified: lld/trunk/lib/Core/NativeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/NativeWriter.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/NativeWriter.cpp (original)
+++ lld/trunk/lib/Core/NativeWriter.cpp Wed Mar 28 14:04:02 2012
@@ -7,17 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <vector>
+#include "lld/Core/NativeWriter.h"
+#include "NativeFileFormat.h"
+#include "lld/Core/File.h"
 
-#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/StringRef.h"
 
-#include "lld/Core/File.h"
-#include "lld/Core/NativeWriter.h"
-
-#include "NativeFileFormat.h"
-
+#include <vector>
 
 namespace lld {
 

Modified: lld/trunk/lib/Core/Resolver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Resolver.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/Resolver.cpp (original)
+++ lld/trunk/lib/Core/Resolver.cpp Wed Mar 28 14:04:02 2012
@@ -11,15 +11,14 @@
 #include "lld/Core/Atom.h"
 #include "lld/Core/File.h"
 #include "lld/Core/InputFiles.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/SymbolTable.h"
 #include "lld/Core/UndefinedAtom.h"
-#include "lld/Platform/Platform.h"
 
 #include "llvm/Support/raw_ostream.h"
 
 #include <algorithm>
 #include <cassert>
-
 #include <vector>
 
 namespace lld {

Modified: lld/trunk/lib/Core/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/SymbolTable.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/SymbolTable.cpp (original)
+++ lld/trunk/lib/Core/SymbolTable.cpp Wed Mar 28 14:04:02 2012
@@ -9,22 +9,22 @@
 
 #include "lld/Core/SymbolTable.h"
 #include "lld/Core/Atom.h"
-#include "lld/Core/DefinedAtom.h"
-#include "lld/Core/UndefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
 #include "lld/Core/AbsoluteAtom.h"
+#include "lld/Core/DefinedAtom.h"
 #include "lld/Core/File.h"
 #include "lld/Core/InputFiles.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/Resolver.h"
-#include "lld/Platform/Platform.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/UndefinedAtom.h"
 
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/Support/ErrorHandling.h"
 
 #include <algorithm>
 #include <cassert>
-#include <stdlib.h>
+#include <cstdlib>
 #include <vector>
 
 namespace lld {

Modified: lld/trunk/lib/Core/YamlKeyValues.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/YamlKeyValues.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/YamlKeyValues.cpp (original)
+++ lld/trunk/lib/Core/YamlKeyValues.cpp Wed Mar 28 14:04:02 2012
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <string.h>
-
 #include "YamlKeyValues.h"
 
 #include "llvm/Support/ErrorHandling.h"
 
+#include <cstring>
+
 namespace lld {
 namespace yaml {
 

Modified: lld/trunk/lib/Core/YamlReader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/YamlReader.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/YamlReader.cpp (original)
+++ lld/trunk/lib/Core/YamlReader.cpp Wed Mar 28 14:04:02 2012
@@ -7,30 +7,27 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <string.h>
-
-#include "YamlKeyValues.h"
-
 #include "lld/Core/YamlReader.h"
+#include "YamlKeyValues.h"
 #include "lld/Core/Atom.h"
-#include "lld/Core/UndefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
 #include "lld/Core/AbsoluteAtom.h"
 #include "lld/Core/Error.h"
 #include "lld/Core/File.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/Reference.h"
-
-#include "lld/Platform/Platform.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/UndefinedAtom.h"
 
 #include "llvm/ADT/APInt.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/system_error.h"
 
+#include <cstring>
 #include <vector>
 
 

Modified: lld/trunk/lib/Core/YamlWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/YamlWriter.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Core/YamlWriter.cpp (original)
+++ lld/trunk/lib/Core/YamlWriter.cpp Wed Mar 28 14:04:02 2012
@@ -7,21 +7,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "YamlKeyValues.h"
-
 #include "lld/Core/YamlWriter.h"
+#include "YamlKeyValues.h"
 #include "lld/Core/Atom.h"
 #include "lld/Core/File.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/Reference.h"
 
-#include "lld/Platform/Platform.h"
-
-#include "llvm/ADT/OwningPtr.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"

Modified: lld/trunk/lib/Passes/GOTPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Passes/GOTPass.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Passes/GOTPass.cpp (original)
+++ lld/trunk/lib/Passes/GOTPass.cpp Wed Mar 28 14:04:02 2012
@@ -6,7 +6,6 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-
 //
 // This linker pass transforms all GOT kind references to real references.
 // That is, in assembly you can write something like:
@@ -30,6 +29,7 @@
 // LEA instruction that is the same size.  The platform method isGOTAccess()
 // should only return true for "canBypassGOT" if this optimization is supported.
 //
+//===----------------------------------------------------------------------===//
 
 #include "lld/Core/DefinedAtom.h"
 #include "lld/Core/File.h"

Modified: lld/trunk/lib/Passes/StubsPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Passes/StubsPass.cpp?rev=153590&r1=153589&r2=153590&view=diff
==============================================================================
--- lld/trunk/lib/Passes/StubsPass.cpp (original)
+++ lld/trunk/lib/Passes/StubsPass.cpp Wed Mar 28 14:04:02 2012
@@ -6,13 +6,13 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-
 //
 // This linker pass updates call sites which have references to shared library
 // atoms to instead have a reference to a stub (PLT entry) for the specified
 // symbol.  The platform object does the work of creating the platform-specific
 // StubAtom.
 //
+//===----------------------------------------------------------------------===//
 
 #include "lld/Core/DefinedAtom.h"
 #include "lld/Core/File.h"





More information about the llvm-commits mailing list