From 843eb0c24be587caa2168261faf9c60d323d066a Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 22 Apr 2014 03:10:36 +0000 Subject: [Modules] Fix potential ODR violations by sinking the DEBUG_TYPE definition below all of the header #include lines, tools edition. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206848 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/ToolRunner.cpp | 3 ++- tools/lli/RemoteMemoryManager.cpp | 3 ++- tools/lli/lli.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index f0fb4bf6f5..e1c995f519 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -11,7 +11,6 @@ // //===----------------------------------------------------------------------===// -#define DEBUG_TYPE "toolrunner" #include "ToolRunner.h" #include "llvm/Config/config.h" // for HAVE_LINK_R #include "llvm/Support/CommandLine.h" @@ -24,6 +23,8 @@ #include using namespace llvm; +#define DEBUG_TYPE "toolrunner" + namespace llvm { cl::opt SaveTemps("save-temps", cl::init(false), cl::desc("Save temporary files")); diff --git a/tools/lli/RemoteMemoryManager.cpp b/tools/lli/RemoteMemoryManager.cpp index e9f4d53ff9..7e0f8cb76d 100644 --- a/tools/lli/RemoteMemoryManager.cpp +++ b/tools/lli/RemoteMemoryManager.cpp @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// -#define DEBUG_TYPE "lli" #include "RemoteMemoryManager.h" #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/ObjectImage.h" @@ -21,6 +20,8 @@ using namespace llvm; +#define DEBUG_TYPE "lli" + RemoteMemoryManager::~RemoteMemoryManager() { for (SmallVector::iterator I = AllocatedSections.begin(), E = AllocatedSections.end(); diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index c0c0f9d2b2..904a9e5830 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -13,7 +13,6 @@ // //===----------------------------------------------------------------------===// -#define DEBUG_TYPE "lli" #include "llvm/IR/LLVMContext.h" #include "RemoteMemoryManager.h" #include "RemoteTarget.h" @@ -64,6 +63,8 @@ using namespace llvm; +#define DEBUG_TYPE "lli" + namespace { cl::opt InputFile(cl::desc(""), cl::Positional, cl::init("-")); -- cgit v1.2.3