[enable usage of targets.ini instead of old arch options
John Meacham <john@repetae.net>**20090623004355
 Ignore-this: e3245e91e849a9d38df5c30f0ad7e7db
] hunk ./C/Arch.hs 3
-    ArchInfo(),
-    archGetPrimInfo,
-    archInfo,
-    archOpTy,
hunk ./C/Arch.hs 4
-    genericArchInfo,
hunk ./C/Arch.hs 5
-    primitiveInfo,
-    genericPrimitiveInfo
+    primitiveInfo
hunk ./C/Arch.hs 76
-genericPrimitiveInfo :: Monad m => ExtType -> m PrimType
-genericPrimitiveInfo et = archGetPrimInfo genericArchInfo et
hunk ./C/Arch.hs 87
-stringToOpTy = archOpTy genericArchInfo
-
-archOpTy :: ArchInfo -> ExtType -> Op.Ty
-archOpTy ai s = case Op.readTy s of
+stringToOpTy ::  ExtType -> Op.Ty
+stringToOpTy s = case Op.readTy s of
hunk ./C/Arch.hs 90
-    _ -> error $ "archOpTy: " ++ show s
---    Nothing -> case archGetPrimInfo ai s of
---        Nothing -> f s
---        Just pt -> case primTypeType pt of
---            PrimTypeIntegral -> Op.TyBits (Op.Bits $ 8 * primTypeSizeOf pt) (if primTypeIsSigned pt then Op.HintSigned else Op.HintUnsigned)
---            PrimTypeFloating ->  Op.TyBits (Op.Bits $ 8 * primTypeSizeOf pt) Op.HintFloat
---            _ -> f s
---  where
---    f "float" = Op.TyBits  (Op.Bits 32) Op.HintFloat
---    f "double" = Op.TyBits (Op.Bits 64) Op.HintFloat
---    f "int" = Op.TyBits (Op.BitsArch Op.BitsInt) Op.HintSigned
---    f "unsigned int" = Op.TyBits (Op.BitsArch Op.BitsInt) Op.HintUnsigned
---
---    f "uintmax_t" = Op.TyBits (Op.BitsArch Op.BitsMax) Op.HintUnsigned
---    f "intmax_t" = Op.TyBits (Op.BitsArch Op.BitsMax)  Op.HintSigned
---    f "uintptr_t" = Op.TyBits (Op.BitsArch Op.BitsPtr) Op.HintUnsigned
---    f "intptr_t" = Op.TyBits (Op.BitsArch Op.BitsPtr) Op.HintSigned
---    f "HsPtr" = Op.TyBits (Op.BitsArch Op.BitsPtr) Op.HintUnsigned
---    f "HsFunPtr" = Op.TyBits (Op.BitsArch Op.BitsPtr) Op.HintUnsigned
---    f s = Op.TyBits (Op.BitsExt s) Op.HintNone
-
+    _ -> error $ "stringToOpTy: " ++ show s
+    
hunk ./C/FromGrin2.hs 881
-    (_,_,as,_) = unsafePerformIO determineArch
+--    (_,_,as,_) = unsafePerformIO determineArch
+    as = []
hunk ./E/FromHs.hs 84
-eArrow t1 t2  =  EPi (tVr emptyId t1) t2
-
hunk ./Main.hs 525
-    (viaGhc,fn,_,_) <- determineArch
-    wdump FD.Progress $ putStrLn $ "Arch: " ++ fn
+--    (viaGhc,fn,_,_) <- determineArch
+--    wdump FD.Progress $ putStrLn $ "Arch: " ++ fn
hunk ./Main.hs 616
-    when viaGhc $ do
-        wdump FD.Core $ printProgram prog
-        fail "Compiling to GHC currently disabled"
+--    when viaGhc $ do
+ --       wdump FD.Core $ printProgram prog
+ --       fail "Compiling to GHC currently disabled"
hunk ./Main.hs 620
-        exitSuccess
+ --       exitSuccess
hunk ./Main.hs 783
-    let fn = optOutName options
-    let cf = (fn ++ "_code.c")
-    let lup k = maybe "" id $ Map.lookup k (optInis options)
+        fn = optOutName options ++ lup "executable_extension"
+        cf = (fn ++ "_code.c")
+        lup k = maybe "" id $ Map.lookup k (optInis options)
hunk ./Makefile.am 49
+          -package bytestring -package binary -package pretty -package base -package mtl -package containers   \
+	  -package unix  -package haskell98 -package utf8-string  -package zlib
+
+PACKAGES_OLD= -package regex-compat -package random -package array -package directory \
hunk ./Makefile.am 54
-	  -package unix  -package haskell98 -package utf8-string -package binary -package zlib \
-      -package base-4.0.0.0 -package syb
+	  -package unix  -package haskell98 -package utf8-string  -package zlib \
+	  -package base -package syb  -package readline -package fgl
+
hunk ./Makefile.am 62
-.PHONY: $(JHC_LIBS)