[llvm-branch-commits] [llvm-gcc-branch] r106046 - in /llvm-gcc-4.2/branches/Apple/Troughton: ./ gcc/llvm-linker-hack.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Tue Jun 15 16:22:39 2010
New Revision: 106046

URL: http://llvm.org/viewvc/llvm-project?rev=106046&view=rev
Log:
$ svn merge -c 106044 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r106044 into '.':
U    gcc/llvm-linker-hack.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Troughton/   (props changed)
    llvm-gcc-4.2/branches/Apple/Troughton/gcc/llvm-linker-hack.cpp

Propchange: llvm-gcc-4.2/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 16:22:39 2010
@@ -1 +1 @@
-/llvm-gcc-4.2/trunk:105535,106018
+/llvm-gcc-4.2/trunk:105535,106018,106044

Modified: llvm-gcc-4.2/branches/Apple/Troughton/gcc/llvm-linker-hack.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Troughton/gcc/llvm-linker-hack.cpp?rev=106046&r1=106045&r2=106046&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Troughton/gcc/llvm-linker-hack.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Troughton/gcc/llvm-linker-hack.cpp Tue Jun 15 16:22:39 2010
@@ -59,8 +59,6 @@
   llvm::createCFGSimplificationPass();
 
   llvm::createDefaultScheduler(NULL, llvm::CodeGenOpt::Default);
-  llvm::createLinearScanRegisterAllocator();
-  llvm::createLocalRegisterAllocator();
 
   llvm::createGVNPass();
   llvm::createLoopRotatePass();