[llvm-branch-commits] [llvm-branch] r155377 - in /llvm/branches/release_31: ./ lib/Target/Hexagon/HexagonISelLowering.cpp

[Bill Wendling]

Author: void
Date: Mon Apr 23 13:34:22 2012
New Revision: 155377

URL: http://llvm.org/viewvc/llvm-project?rev=155377&view=rev
Log:
Merging r155286:
------------------------------------------------------------------------
r155286 | chapuni | 2012-04-21 08:31:36 -0700 (Sat, 21 Apr 2012) | 1 line

HexagonISelLowering.cpp: Reorder #includes.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/lib/Target/Hexagon/HexagonISelLowering.cpp

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 23 13:34:22 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230,155284-155285,155288,155307,155342
+/llvm/trunk:155230,155284-155286,155288,155307,155342

Modified: llvm/branches/release_31/lib/Target/Hexagon/HexagonISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/lib/Target/Hexagon/HexagonISelLowering.cpp?rev=155377&r1=155376&r2=155377&view=diff
==============================================================================
--- llvm/branches/release_31/lib/Target/Hexagon/HexagonISelLowering.cpp (original)
+++ llvm/branches/release_31/lib/Target/Hexagon/HexagonISelLowering.cpp Mon Apr 23 13:34:22 2012
@@ -32,9 +32,10 @@
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/SelectionDAGISel.h"
 #include "llvm/CodeGen/ValueTypes.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/CommandLine.h"
+
 using namespace llvm;
 
 const unsigned Hexagon_MAX_RET_SIZE = 64;