diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2013-01-25 13:26:18 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2013-01-25 13:26:18 +0000 |
| commit | 0ab8cc19bc73f19cc91daea2b649faa7960bcf73 (patch) | |
| tree | ec5495074a9c3869e364135869b06e9a754db06b /compiler/utils/Platform.hs | |
| parent | e3426665b056ef9dcaa48722e2e33f260f055727 (diff) | |
| parent | a47ee23a82a669808569b3865383bf932b67fa95 (diff) | |
| download | haskell-0ab8cc19bc73f19cc91daea2b649faa7960bcf73.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Conflicts:
compiler/basicTypes/DataCon.lhs
Diffstat (limited to 'compiler/utils/Platform.hs')
| -rw-r--r-- | compiler/utils/Platform.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs index 661e03a3a5..090ce41f30 100644 --- a/compiler/utils/Platform.hs +++ b/compiler/utils/Platform.hs @@ -70,6 +70,7 @@ data OS | OSHaiku | OSOsf3 | OSQNXNTO + | OSAndroid deriving (Read, Show, Eq) -- | ARM Instruction Set Architecture, Extensions and ABI @@ -112,6 +113,7 @@ osElfTarget OSHaiku = True osElfTarget OSOsf3 = False -- I don't know if this is right, but as -- per comment below it's safe osElfTarget OSQNXNTO = False +osElfTarget OSAndroid = True osElfTarget OSUnknown = False -- Defaulting to False is safe; it means don't rely on any -- ELF-specific functionality. It is important to have a default for |