summaryrefslogtreecommitdiff
path: root/rts/sm
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2013-01-16 19:38:19 +0000
committerSimon Marlow <marlowsd@gmail.com>2013-01-17 10:04:47 +0000
commit520dc1d245fa5d965bdc7e97231e868de7c1dd9e (patch)
tree7f37b7708a092ffc7775d00ee33dbbb244a8e4c4 /rts/sm
parentaef38d130b0ff74b0a5f2478be985e96b40c0f97 (diff)
downloadhaskell-520dc1d245fa5d965bdc7e97231e868de7c1dd9e.tar.gz
Rearrange includes to avoid a clash on ARM/Linux
Diffstat (limited to 'rts/sm')
-rw-r--r--rts/sm/GC.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 7ce8a4e30d..f4a479ec63 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>