Commit ad94d409 authored by Ian Lynagh's avatar Ian Lynagh

Use OPTIONS rather than OPTIONS_GHC for pragmas

Older GHCs can't parse OPTIONS_GHC.
This also changes the URL referenced for the -w options from
WorkingConventions#Warnings to CodingStyle#Warnings for the compiler
modules.
parent 45202530
...@@ -222,7 +222,7 @@ boot :: $(CONFIG_HS) ...@@ -222,7 +222,7 @@ boot :: $(CONFIG_HS)
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@$(RM) -f $(CONFIG_HS) @$(RM) -f $(CONFIG_HS)
@echo "Creating $(CONFIG_HS) ... " @echo "Creating $(CONFIG_HS) ... "
@echo "{-# OPTIONS_GHC -w #-}" >>$(CONFIG_HS) @echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS)
@echo "module Config where" >>$(CONFIG_HS) @echo "module Config where" >>$(CONFIG_HS)
@echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS)
@echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
......
...@@ -14,11 +14,11 @@ types that ...@@ -14,11 +14,11 @@ types that
\end{itemize} \end{itemize}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module BasicTypes( module BasicTypes(
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[DataCon]{@DataCon@: Data Constructors} \section[DataCon]{@DataCon@: Data Constructors}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module DataCon ( module DataCon (
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[Demand]{@Demand@: the amount of demand on a value} \section[Demand]{@Demand@: the amount of demand on a value}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
#ifndef OLD_STRICTNESS #ifndef OLD_STRICTNESS
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[Id]{@Ids@: Value and constructor identifiers} \section[Id]{@Ids@: Value and constructor identifiers}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Id ( module Id (
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
Haskell. [WDP 94/11]) Haskell. [WDP 94/11])
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module IdInfo ( module IdInfo (
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[Literal]{@Literal@: Machine literals (unboxed, of course)} \section[Literal]{@Literal@: Machine literals (unboxed, of course)}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Literal module Literal
......
...@@ -12,11 +12,11 @@ have a standard form, namely: ...@@ -12,11 +12,11 @@ have a standard form, namely:
* primitive operations * primitive operations
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module MkId ( module MkId (
......
...@@ -9,11 +9,11 @@ These are Uniquable, hence we can build FiniteMaps with Modules as ...@@ -9,11 +9,11 @@ These are Uniquable, hence we can build FiniteMaps with Modules as
the keys. the keys.
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Module module Module
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[Name]{@Name@: to transmit name info from renamer to typechecker} \section[Name]{@Name@: to transmit name info from renamer to typechecker}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Name ( module Name (
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[NameEnv]{@NameEnv@: name environments} \section[NameEnv]{@NameEnv@: name environments}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module NameEnv ( module NameEnv (
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module NameSet ( module NameSet (
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section[Demand]{@Demand@: the amount of demand on a value} \section[Demand]{@Demand@: the amount of demand on a value}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module NewDemand( module NewDemand(
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module OccName ( module OccName (
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module RdrName ( module RdrName (
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module SrcLoc ( module SrcLoc (
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module UniqSupply ( module UniqSupply (
......
...@@ -16,11 +16,11 @@ Some of the other hair in this code is to be able to use a ...@@ -16,11 +16,11 @@ Some of the other hair in this code is to be able to use a
Haskell). Haskell).
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Unique ( module Unique (
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
\section{@Vars@: Variables} \section{@Vars@: Variables}
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Var ( module Var (
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module VarEnv ( module VarEnv (
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
% %
\begin{code} \begin{code}
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module VarSet ( module VarSet (
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
-- --
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module CLabel ( module CLabel (
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
-- --
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module Cmm ( module Cmm (
......
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module CmmBrokenBlock ( module CmmBrokenBlock (
......
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module CmmCPS ( module CmmCPS (
......
{-# OPTIONS_GHC -w #-} {-# OPTIONS -w #-}
-- The above warning supression flag is a temporary kludge. -- The above warning supression flag is a temporary kludge.
-- While working on this module you are encouraged to remove it and fix -- While working on this module you are encouraged to remove it and fix
-- any warnings in the module. See -- any warnings in the module. See
-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings -- http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
-- for details -- for details
module CmmCPSGen ( module CmmCPSGen (
......