diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-02-12 13:29:29 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-02-12 13:29:29 -0800 |
| commit | cfd89e12334e7dbcc8d9aaee898bcc38b77f549b (patch) | |
| tree | 44510e960a6ac31c88219010052ea9b2e5d7217d /compiler/nativeGen | |
| parent | 5851f84733f4ef1ee158b911febd753ced619555 (diff) | |
| parent | 86ebfef9a5acc60b7a2ce3c8f025e6e707f17f87 (diff) | |
| download | haskell-cfd89e12334e7dbcc8d9aaee898bcc38b77f549b.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Conflicts:
compiler/coreSyn/CoreLint.lhs
Diffstat (limited to 'compiler/nativeGen')
| -rw-r--r-- | compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot index 0e639a3caf..7de92cb659 100644 --- a/compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot +++ b/compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot @@ -1,14 +1,7 @@ -{-# OPTIONS -fno-warn-tabs #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and --- detab the module (please do the detabbing in a separate patch). See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces --- for details - module SPARC.CodeGen.Gen32 ( - getSomeReg, - getRegister + getSomeReg, + getRegister ) where |