summaryrefslogtreecommitdiff
path: root/compiler/utils
diff options
context:
space:
mode:
authorPatrick Palka <patrick@parcs.ath.cx>2013-09-08 22:10:50 -0400
committerPatrick Palka <patrick@parcs.ath.cx>2013-09-08 22:10:50 -0400
commit783ca393d9b262fe0efc6308e71c95a2da0eda1a (patch)
treed515913f550abc335500613a02c1311d6e12e341 /compiler/utils
parenta58ba1856451447350132f20637deb898ebee252 (diff)
parent2cec084e45392e0b0d198254017b140accee32f0 (diff)
downloadhaskell-ghc-parmake-gsoc.tar.gz
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsocghc-parmake-gsoc
Diffstat (limited to 'compiler/utils')
-rw-r--r--compiler/utils/Platform.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 617e691ddf..f69bb4cdf6 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -54,6 +54,7 @@ data Arch
| ArchAlpha
| ArchMipseb
| ArchMipsel
+ | ArchJavaScript
deriving (Read, Show, Eq)
isARM :: Arch -> Bool