[lld][LayoutPass] Consolidate debug flags, removing "layout" flag.

DEBUG_TYPE is already defined at the beginning of this file. We don't
want to have two different debug flags for a single pass.

Reviewers: shankarke

CC: llvm-commits

Differential Revision: http://llvm-reviews.chandlerc.com/D845

llvm-svn: 182543

1 files changed, 2 insertions, 4 deletions

diff --git a/lld/lib/Passes/LayoutPass.cpp b/lld/lib/Passes/LayoutPass.cpp
index 9c8a2e17e2d..6dc9e0bab8e 100644
--- a/lld/lib/Passes/LayoutPass.cpp
+++ b/lld/lib/Passes/LayoutPass.cpp
@@ -11,9 +11,7 @@
 #define DEBUG_TYPE "LayoutPass"
 
 #include "lld/Passes/LayoutPass.h"
-
 #include "lld/Core/Instrumentation.h"
-
 #include "llvm/Support/Debug.h"
 
 using namespace lld;
@@ -413,7 +411,7 @@ void LayoutPass::perform(MutableFile &mergedFile) {
   // Build override maps
   buildOrdinalOverrideMap(atomRange);
 
-  DEBUG_WITH_TYPE("layout", {
+  DEBUG({
     llvm::dbgs() << "unsorted atoms:\n";
     for (const DefinedAtom *atom : atomRange) {
       llvm::dbgs() << "  file=" << atom->file().path()
@@ -428,7 +426,7 @@ void LayoutPass::perform(MutableFile &mergedFile) {
   // sort the atoms
   std::sort(atomRange.begin(), atomRange.end(), _compareAtoms);
 
-  DEBUG_WITH_TYPE("layout", {
+  DEBUG({
     llvm::dbgs() << "sorted atoms:\n";
     for (const DefinedAtom *atom : atomRange) {
       llvm::dbgs() << "  file=" << atom->file().path()