Add -Wno-sync-nand to ghcPrim's cbits/atomic.c

See GHC ticket #9678

diff --git a/cfg/system.config.in b/cfg/system.config.in
index 9ea0f44..667a22d 100644 (file)
--- a/cfg/system.config.in
+++ b/cfg/system.config.in
@@ -30,6 +30,7 @@ ar-supports-at-file = @ArSupportsAtFile@
 cc-clang-backend    = @CC_CLANG_BACKEND@
 cc-llvm-backend     = @CC_LLVM_BACKEND@
 gcc-is-clang        = @GccIsClang@
+gcc-lt-44           = @GccLT44@
 gcc-lt-46           = @GccLT46@
 hs-cpp-args         = @HaskellCPPArgs@
 

diff --git a/src/Oracles/Config/Flag.hs b/src/Oracles/Config/Flag.hs
index 6c5879d..8ac753f 100644 (file)
--- a/src/Oracles/Config/Flag.hs
+++ b/src/Oracles/Config/Flag.hs
@@ -12,6 +12,7 @@ import Oracles.Config.Setting
 data Flag = ArSupportsAtFile
           | CrossCompiling
           | GccIsClang
+          | GccLt44
           | GccLt46
           | GhcUnregisterised
           | LeadingUnderscore
@@ -29,6 +30,7 @@ flag f = do
             ArSupportsAtFile   -> "ar-supports-at-file"
             CrossCompiling     -> "cross-compiling"
             GccIsClang         -> "gcc-is-clang"
+            GccLt44            -> "gcc-lt-44"
             GccLt46            -> "gcc-lt-46"
             GhcUnregisterised  -> "ghc-unregisterised"
             LeadingUnderscore  -> "leading-underscore"

diff --git a/src/Settings/Packages/GhcPrim.hs b/src/Settings/Packages/GhcPrim.hs
index 225ff56..bed8345 100644 (file)
--- a/src/Settings/Packages/GhcPrim.hs
+++ b/src/Settings/Packages/GhcPrim.hs
@@ -1,8 +1,13 @@
 module Settings.Packages.GhcPrim (ghcPrimPackageArgs) where
 
 import GHC
+import Oracles.Config.Flag
 import Predicate
 
 ghcPrimPackageArgs :: Args
-ghcPrimPackageArgs = package ghcPrim ?
-    builder GhcCabal ? arg "--flag=include-ghc-prim"
+ghcPrimPackageArgs = package ghcPrim ? mconcat
+    [ builder GhcCabal ? arg "--flag=include-ghc-prim"
+
+    , builder (Cc CompileC)    ?
+      (not <$> flag GccLt44)   ?
+      input "//cbits/atomic.c" ? arg "-Wno-sync-nand" ]