diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2014-04-22 03:21:31 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2014-04-22 03:21:31 +0000 |
| commit | 9afe32d11dea6f052505c73e08013b9224eb20ef (patch) | |
| tree | fff19683d59dbd071ece929cb6db9679db4044b7 /lld/lib/ReaderWriter/PECOFF | |
| parent | 64e48d72f496b3ae97fd772f8e83a0e3f52abf32 (diff) | |
| download | bcm5719-llvm-9afe32d11dea6f052505c73e08013b9224eb20ef.tar.gz bcm5719-llvm-9afe32d11dea6f052505c73e08013b9224eb20ef.zip | |
[Modules] Fix potential ODR violations by sinking the DEBUG_TYPE
definition below all of the header #include lines, LLD edition.
IF you want to know more details about this, you can see the recent
commits to Debug.h in LLVM. This is just the LLD segment of a cleanup
I'm doing globally for this macro.
llvm-svn: 206851
Diffstat (limited to 'lld/lib/ReaderWriter/PECOFF')
| -rw-r--r-- | lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp | 4 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp | 4 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp index d4b3d10b947..b7c4c31f35b 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp @@ -7,8 +7,6 @@ // //===----------------------------------------------------------------------===// -#define DEBUG_TYPE "ReaderCOFF" - #include "Atoms.h" #include "ReaderImportHeader.h" @@ -38,6 +36,8 @@ #include <set> #include <vector> +#define DEBUG_TYPE "ReaderCOFF" + using std::vector; using lld::pecoff::COFFAbsoluteAtom; using lld::pecoff::COFFBSSAtom; diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp index 16459bb66cd..a3361461cd0 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp @@ -118,8 +118,6 @@ /// //===----------------------------------------------------------------------===// -#define DEBUG_TYPE "ReaderImportHeader" - #include "Atoms.h" #include "lld/Core/File.h" @@ -147,6 +145,8 @@ using namespace lld; using namespace lld::pecoff; using namespace llvm; +#define DEBUG_TYPE "ReaderImportHeader" + namespace lld { namespace { diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp index 6da91958bc3..ec281ed2e9e 100644 --- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp @@ -19,8 +19,6 @@ /// //===----------------------------------------------------------------------===// -#define DEBUG_TYPE "WriterPECOFF" - #include "Atoms.h" #include "WriterImportLibrary.h" @@ -46,6 +44,8 @@ #include <time.h> #include <vector> +#define DEBUG_TYPE "WriterPECOFF" + using llvm::COFF::DataDirectoryIndex; using llvm::object::coff_runtime_function_x64; using llvm::support::ulittle16_t; |

