COFF: Fix bad #includes.

Writer.h is intended to be included only by Writer.cpp and Driver.cpp.
Use of the header in other files are bad.

llvm-svn: 244106

diff --git a/lld/COFF/Chunks.cpp b/lld/COFF/Chunks.cpp
index b5c6e35..fe8b990 100644 (file)
--- a/lld/COFF/Chunks.cpp
+++ b/lld/COFF/Chunks.cpp
@@ -9,7 +9,7 @@
 
 #include "Chunks.h"
 #include "InputFiles.h"
-#include "Writer.h"
+#include "Symbols.h"
 #include "llvm/Object/COFF.h"
 #include "llvm/Support/COFF.h"
 #include "llvm/Support/Debug.h"

diff --git a/lld/COFF/Chunks.h b/lld/COFF/Chunks.h
index 3d36675..6d77749 100644 (file)
--- a/lld/COFF/Chunks.h
+++ b/lld/COFF/Chunks.h
@@ -37,6 +37,10 @@ class ObjectFile;
 class OutputSection;
 class SymbolBody;
 
+// Mask for section types (code, data, bss, disacardable, etc.)
+// and permissions (writable, readable or executable).
+const uint32_t PermMask = 0xFF0000F0;
+
 // A Chunk represents a chunk of data that will occupy space in the
 // output (if the resolver chose that). It may or may not be backed by
 // a section of an input file. It could be linker-created data, or

diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp
index 9214af6..215271c 100644 (file)
--- a/lld/COFF/InputFiles.cpp
+++ b/lld/COFF/InputFiles.cpp
@@ -10,7 +10,7 @@
 #include "Chunks.h"
 #include "Error.h"
 #include "InputFiles.h"
-#include "Writer.h"
+#include "Symbols.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/LTO/LTOModule.h"
 #include "llvm/Object/COFF.h"

diff --git a/lld/COFF/Writer.h b/lld/COFF/Writer.h
index 9259629..f5f4f12 100644 (file)
--- a/lld/COFF/Writer.h
+++ b/lld/COFF/Writer.h
@@ -21,10 +21,6 @@
 namespace lld {
 namespace coff {
 
-// Mask for section types (code, data, bss, disacardable, etc.)
-// and permissions (writable, readable or executable).
-const uint32_t PermMask = 0xFF0000F0;
-
 // Implemented in ICF.cpp.
 void doICF(const std::vector<Chunk *> &Chunks);