[commit: ghc] master: Rearrange includes to avoid a clash on ARM/Linux (520dc1d)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/520dc1d245fa5d965bdc7e97231e868de7c1dd9e

>---------------------------------------------------------------

commit 520dc1d245fa5d965bdc7e97231e868de7c1dd9e
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Jan 16 19:38:19 2013 +0000

    Rearrange includes to avoid a clash on ARM/Linux

>---------------------------------------------------------------

 rts/sm/GC.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 7ce8a4e..f4a479e 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -15,6 +15,19 @@
 #include "Rts.h"
 #include "HsFFI.h"
 
+#include "GC.h"
+#include "GCThread.h"
+#include "GCTDecl.h"            // NB. before RtsSignals.h which
+                                // clobbers REG_R1 on arm/Linux
+#include "Compact.h"
+#include "Evac.h"
+#include "Scav.h"
+#include "GCUtils.h"
+#include "MarkStack.h"
+#include "MarkWeak.h"
+#include "Sparks.h"
+#include "Sweep.h"
+
 #include "Storage.h"
 #include "RtsUtils.h"
 #include "Apply.h"
@@ -38,18 +51,6 @@
 #include "Papi.h"
 #include "Stable.h"
 
-#include "GC.h"
-#include "GCThread.h"
-#include "GCTDecl.h"
-#include "Compact.h"
-#include "Evac.h"
-#include "Scav.h"
-#include "GCUtils.h"
-#include "MarkStack.h"
-#include "MarkWeak.h"
-#include "Sparks.h"
-#include "Sweep.h"
-
 #include <string.h> // for memset()
 #include <unistd.h>