Ticket #5606: 0001-Fix-validate-by-moving-OPTIONS-fno-warn-tabs.patch

File 0001-Fix-validate-by-moving-OPTIONS-fno-warn-tabs.patch, 4.5 KB (added by thorkilnaur, 20 months ago)

Fix validate by moving OPTIONS -fno-warn-tabs

  • compiler/basicTypes/Id.lhs 

    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 b  
    55\section[Id]{@Ids@: Value and constructor identifiers} 
    66 
    77\begin{code} 
     8{-# OPTIONS -fno-warn-tabs #-} 
     9-- The above warning supression flag is a temporary kludge. 
     10-- While working on this module you are encouraged to remove it and 
     11-- detab the module (please do the detabbing in a separate patch). See 
     12--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces 
     13-- for details 
     14 
    815-- | 
    916-- #name_types# 
    1017-- GHC uses several kinds of name internally: 
    … …  
    2229-- 
    2330-- * 'Var.Var': see "Var#name_types" 
    2431 
    25 {-# OPTIONS -fno-warn-tabs #-} 
    26 -- The above warning supression flag is a temporary kludge. 
    27 -- While working on this module you are encouraged to remove it and 
    28 -- detab the module (please do the detabbing in a separate patch). See 
    29 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces 
    30 -- for details 
    31  
    3232module Id ( 
    3333        -- * The main types 
    3434        Var, Id, isId, 

  • compiler/basicTypes/Name.lhs 

    diff --git a/compiler/basicTypes/Name.lhs b/compiler/basicTypes/Name.lhs
index fde5890..64ca362 100644
    a b  
    55\section[Name]{@Name@: to transmit name info from renamer to typechecker} 
    66 
    77\begin{code} 
     8{-# OPTIONS -fno-warn-tabs #-} 
     9-- The above warning supression flag is a temporary kludge. 
     10-- While working on this module you are encouraged to remove it and 
     11-- detab the module (please do the detabbing in a separate patch). See 
     12--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces 
     13-- for details 
     14 
    815-- | 
    916-- #name_types# 
    1017-- GHC uses several kinds of name internally: 
    … …  
    3138--  * Internal, if they name things in the module being compiled. Some internal 
    3239--    Names are system names, if they are names manufactured by the compiler 
    3340 
    34 {-# OPTIONS -fno-warn-tabs #-} 
    35 -- The above warning supression flag is a temporary kludge. 
    36 -- While working on this module you are encouraged to remove it and 
    37 -- detab the module (please do the detabbing in a separate patch). See 
    38 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces 
    39 -- for details 
    40  
    4141module Name ( 
    4242        -- * The main types 
    4343        Name,                                   -- Abstract 

  • compiler/nativeGen/PPC/Instr.hs 

    diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs
index d6f4baf..63872e1 100644
    a b  
    66-- 
    77----------------------------------------------------------------------------- 
    88 
    9 #include "HsVersions.h" 
    10 #include "nativeGen/NCG.h" 
    11  
    129{-# OPTIONS -fno-warn-tabs #-} 
    1310-- The above warning supression flag is a temporary kludge. 
    1411-- While working on this module you are encouraged to remove it and 
    … …  
    1613--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces 
    1714-- for details 
    1815 
     16#include "HsVersions.h" 
     17#include "nativeGen/NCG.h" 
     18 
    1919module PPC.Instr ( 
    2020        archWordSize, 
    2121        RI(..), 

  • compiler/nativeGen/SPARC/Instr.hs 

    diff --git a/compiler/nativeGen/SPARC/Instr.hs b/compiler/nativeGen/SPARC/Instr.hs
index 742a4e7..82e16ee 100644
    a b  
    66-- 
    77----------------------------------------------------------------------------- 
    88 
    9 #include "HsVersions.h" 
    10 #include "nativeGen/NCG.h" 
    11  
    129{-# OPTIONS -fno-warn-tabs #-} 
    1310-- The above warning supression flag is a temporary kludge. 
    1411-- While working on this module you are encouraged to remove it and 
    … …  
    1613--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces 
    1714-- for details 
    1815 
     16#include "HsVersions.h" 
     17#include "nativeGen/NCG.h" 
     18 
    1919module SPARC.Instr ( 
    2020        RI(..), 
    2121        riZero,