Permalink
Browse files

Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

  • Loading branch information...
2 parents effdd65 + be956c2 commit ba2c7535a8461be8ce72ccdd4c34173568787491 @igfoo igfoo committed Mar 19, 2013
Showing with 5 additions and 0 deletions.
  1. +1 −0 compiler/main/DynFlags.hs
  2. +4 −0 compiler/utils/Platform.hs
@@ -3407,6 +3407,7 @@ makeDynFlagsConsistent dflags
in loop dflags' warn
| hscTarget dflags == HscLlvm &&
not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin)) &&
+ not ((isARM arch) && (os == OSLinux)) &&
(not (gopt Opt_Static dflags) || gopt Opt_PIC dflags)
= if cGhcWithNativeCodeGen == "YES"
then let dflags' = dflags { hscTarget = HscAsm }
@@ -10,6 +10,7 @@ module Platform (
ArmABI(..),
target32Bit,
+ isARM,
osElfTarget,
platformUsesFrameworks,
)
@@ -54,6 +55,9 @@ data Arch
| ArchMipsel
deriving (Read, Show, Eq)
+isARM :: Arch -> Bool
+isARM (ArchARM {}) = True
+isARM _ = False
-- | Operating systems that the native code generator knows about.
-- Having OSUnknown should produce a sensible default, but no promises.

0 comments on commit ba2c753

Please sign in to comment.