[project @ 1999-01-25 11:42:51 by sof]

Tweaks to make the sources compilable again on osf3.2

diff --git a/ghc/compiler/main/Constants.lhs b/ghc/compiler/main/Constants.lhs
index 3aa4d59..c0bf487 100644 (file)
--- a/ghc/compiler/main/Constants.lhs
+++ b/ghc/compiler/main/Constants.lhs
@@ -181,7 +181,11 @@ mAX_Long_REG    = (MAX_LONG_REG  :: Int)
 mAX_Real_Vanilla_REG   = (MAX_REAL_VANILLA_REG :: Int)
 mAX_Real_Float_REG     = (MAX_REAL_FLOAT_REG :: Int)
 mAX_Real_Double_REG    = (MAX_REAL_DOUBLE_REG :: Int)
+#ifdef MAX_REAL_LONG_REG
 mAX_Real_Long_REG      = (MAX_REAL_LONG_REG :: Int)
+#else
+mAX_Real_Long_REG       = (0::Int)
+#endif
 \end{code}
 
 Closure header sizes.

diff --git a/ghc/compiler/nativeGen/MachCode.lhs b/ghc/compiler/nativeGen/MachCode.lhs
index fde05dd..0fd076d 100644 (file)
--- a/ghc/compiler/nativeGen/MachCode.lhs
+++ b/ghc/compiler/nativeGen/MachCode.lhs
@@ -316,7 +316,7 @@ getRegister (StPrim primop [x]) -- unary PrimOps
       Double2FloatOp -> coerceFltCode x
       Float2DoubleOp -> coerceFltCode x
 
-      other_op -> getRegister (StCall fn cconv DoubleRep [x])
+      other_op -> getRegister (StCall fn cCallConv DoubleRep [x])
        where
          fn = case other_op of
                 FloatExpOp    -> SLIT("exp")