diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2011-12-29 16:45:30 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2011-12-29 16:45:30 -0800 |
| commit | 896d20fabdf0087e8dd33cc419a377b7a9adee88 (patch) | |
| tree | 6acfc745bb5d75ccc921af6521e5294d2d69da3f /compiler/nativeGen/SPARC/CodeGen/CondCode.hs | |
| parent | 42186dd64c22f23bbdb15a27e608cb52ba7d617f (diff) | |
| parent | b0c0205e3c0dfefc3ffbd49d22160ad5d624ee1f (diff) | |
| download | haskell-896d20fabdf0087e8dd33cc419a377b7a9adee88.tar.gz | |
Merge branch 'master' into type-nats
Conflicts:
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcSMonad.lhs
Diffstat (limited to 'compiler/nativeGen/SPARC/CodeGen/CondCode.hs')
| -rw-r--r-- | compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/nativeGen/SPARC/CodeGen/CondCode.hs b/compiler/nativeGen/SPARC/CodeGen/CondCode.hs index 215a565ba6..f02b7a45a8 100644 --- a/compiler/nativeGen/SPARC/CodeGen/CondCode.hs +++ b/compiler/nativeGen/SPARC/CodeGen/CondCode.hs @@ -62,10 +62,10 @@ getCondCode (CmmMachOp mop [x, y]) MO_U_Lt _ -> condIntCode LU x y MO_U_Le _ -> condIntCode LEU x y - _ -> do dflags <- getDynFlagsNat + _ -> do dflags <- getDynFlags pprPanic "SPARC.CodeGen.CondCode.getCondCode" (pprPlatform (targetPlatform dflags) (CmmMachOp mop [x,y])) -getCondCode other = do dflags <- getDynFlagsNat +getCondCode other = do dflags <- getDynFlags pprPanic "SPARC.CodeGen.CondCode.getCondCode" (pprPlatform (targetPlatform dflags) other) |