[lld] r182975 - Revert "[Passes] Parallelize the layout pass sort."

Michael J. Spencer bigcheesegs at gmail.com
Thu May 30 17:05:49 PDT 2013


Author: mspencer
Date: Thu May 30 19:05:49 2013
New Revision: 182975

URL: http://llvm.org/viewvc/llvm-project?rev=182975&view=rev
Log:
Revert "[Passes] Parallelize the layout pass sort."

Inconsistent (and wrong) sort order on non-Windows.

Modified:
    lld/trunk/lib/Passes/LayoutPass.cpp

Modified: lld/trunk/lib/Passes/LayoutPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Passes/LayoutPass.cpp?rev=182975&r1=182974&r2=182975&view=diff
==============================================================================
--- lld/trunk/lib/Passes/LayoutPass.cpp (original)
+++ lld/trunk/lib/Passes/LayoutPass.cpp Thu May 30 19:05:49 2013
@@ -12,7 +12,6 @@
 
 #include "lld/Passes/LayoutPass.h"
 #include "lld/Core/Instrumentation.h"
-#include "lld/Core/Parallel.h"
 #include "llvm/Support/Debug.h"
 
 using namespace lld;
@@ -426,7 +425,7 @@ void LayoutPass::perform(MutableFile &me
   });
 
   // sort the atoms
-  parallel_sort(atomRange.begin(), atomRange.end(), _compareAtoms);
+  std::sort(atomRange.begin(), atomRange.end(), _compareAtoms);
 
   DEBUG({
     llvm::dbgs() << "sorted atoms:\n";





More information about the llvm-commits mailing list