From fd46f0c5b04983bf60e9f1efc5c36853671d837f Mon Sep 17 00:00:00 2001
From: Thorkil Naur <naur@post11.tele.dk>
Date: Sun, 6 Nov 2011 17:57:49 +0100
Subject: [PATCH] Fix validate by moving OPTIONS -fno-warn-tabs Validate fixed
 for Mac OS X 10.5 and Linux. For both:  
 compiler/nativeGen/PPC/Instr.hs  
 compiler/nativeGen/SPARC/Instr.hs failed to (stage1) build.
 For Mac OS X, but mysteriously not for Linux:  
 compiler/basicTypes/Id.lhs   compiler/basicTypes/Name.lhs
 failed during haddock'ing.

---
 compiler/basicTypes/Id.lhs        |   14 +++++++-------
 compiler/basicTypes/Name.lhs      |   14 +++++++-------
 compiler/nativeGen/PPC/Instr.hs   |    6 +++---
 compiler/nativeGen/SPARC/Instr.hs |    6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/compiler/basicTypes/Id.lhs b/compiler/basicTypes/Id.lhs
index 1a4f95c..d1df6cc 100644
--- a/compiler/basicTypes/Id.lhs
+++ b/compiler/basicTypes/Id.lhs
@@ -5,6 +5,13 @@
 \section[Id]{@Ids@: Value and constructor identifiers}
 
 \begin{code}
+{-# 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
+
 -- |
 -- #name_types#
 -- GHC uses several kinds of name internally:
@@ -22,13 +29,6 @@
 --
 -- * 'Var.Var': see "Var#name_types"
 
-{-# 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 Id (
         -- * The main types
 	Var, Id, isId,
diff --git a/compiler/basicTypes/Name.lhs b/compiler/basicTypes/Name.lhs
index fde5890..64ca362 100644
--- a/compiler/basicTypes/Name.lhs
+++ b/compiler/basicTypes/Name.lhs
@@ -5,6 +5,13 @@
 \section[Name]{@Name@: to transmit name info from renamer to typechecker}
 
 \begin{code}
+{-# 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
+
 -- |
 -- #name_types#
 -- GHC uses several kinds of name internally:
@@ -31,13 +38,6 @@
 --  * Internal, if they name things in the module being compiled. Some internal
 --    Names are system names, if they are names manufactured by the compiler
 
-{-# 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 Name (
 	-- * The main types
 	Name,					-- Abstract
diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs
index d6f4baf..63872e1 100644
--- a/compiler/nativeGen/PPC/Instr.hs
+++ b/compiler/nativeGen/PPC/Instr.hs
@@ -6,9 +6,6 @@
 --
 -----------------------------------------------------------------------------
 
-#include "HsVersions.h"
-#include "nativeGen/NCG.h"
-
 {-# 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
@@ -16,6 +13,9 @@
 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
 -- for details
 
+#include "HsVersions.h"
+#include "nativeGen/NCG.h"
+
 module PPC.Instr (
 	archWordSize,
 	RI(..),
diff --git a/compiler/nativeGen/SPARC/Instr.hs b/compiler/nativeGen/SPARC/Instr.hs
index 742a4e7..82e16ee 100644
--- a/compiler/nativeGen/SPARC/Instr.hs
+++ b/compiler/nativeGen/SPARC/Instr.hs
@@ -6,9 +6,6 @@
 --
 -----------------------------------------------------------------------------
 
-#include "HsVersions.h"
-#include "nativeGen/NCG.h"
-
 {-# 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
@@ -16,6 +13,9 @@
 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
 -- for details
 
+#include "HsVersions.h"
+#include "nativeGen/NCG.h"
+
 module SPARC.Instr (
 	RI(..),
 	riZero,
-- 
1.7.6.4