Remove old GHC-8.4 stuff

clash-lang · Jun 20, 2023 · f35ba85 · f35ba85
1 parent e2daa0a
commit f35ba85
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 42 deletions.
diff --git a/clash-cores/clash-cores.cabal b/clash-cores/clash-cores.cabal
@@ -53,16 +53,13 @@ common basic-config
     MagicHash
     NoImplicitPrelude
     PostfixOperators
+    NoStarIsType
     ScopedTypeVariables
     TemplateHaskell
     TypeApplications
     TypeFamilies
     TypeOperators
 
-  if impl(ghc >= 8.6)
-    default-extensions:
-      NoStarIsType
-
   ghc-options:
     -Wall -Wcompat
 

diff --git a/clash-dev b/clash-dev
@@ -1,10 +1,5 @@
 #!/bin/sh
 GHC_VERSION=$(ghc --numeric-version)
-GHC_MAJOR_VERSION=$(echo ${GHC_VERSION} | tr -d '.' | head -c2)
-
-if [ ${GHC_MAJOR_VERSION} != 84 ]; then
-  XNoStarIsType="-XNoStarIsType"
-fi
 
 ghci \
   -fobject-code \
@@ -15,7 +10,7 @@ ghci \
   -XBangPatterns -XBinaryLiterals -XDataKinds -XDefaultSignatures \
   -XDeriveDataTypeable -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric \
   -XDeriveLift -XDeriveTraversable -XDerivingStrategies -XInstanceSigs \
-  -XKindSignatures ${XNoStarIsType} -XPostfixOperators -XScopedTypeVariables \
+  -XKindSignatures -XNoStarIsType -XPostfixOperators -XScopedTypeVariables \
   -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators \
   -XViewPatterns -XNoPolyKinds -DDEBUG \
   Clash.hs
diff --git a/clash-dev.ps1 b/clash-dev.ps1
@@ -1,9 +1,4 @@
 $GHC_VERSION=(ghc --numeric-version)
-$GHC_MAJOR_VERSION=Write-Output $GHC_VERSION | wsl tr -d '.' | wsl head -c2
-
-if ($GHC_MAJOR_VERSION -ne 84) {
-  $XNoStarIsType="-XNoStarIsType"
-}
 
 ghci `
   -fobject-code `
@@ -14,7 +9,7 @@ ghci `
   -XBangPatterns -XBinaryLiterals -XDataKinds -XDefaultSignatures `
   -XDeriveDataTypeable -XDeriveFoldable -XDeriveFunctor -XDeriveGeneric `
   -XDeriveLift -XDeriveTraversable -XDerivingStrategies -XInstanceSigs `
-  -XKindSignatures -XPostfixOperators $XNoStarIsType -XScopedTypeVariables `
+  -XKindSignatures -XPostfixOperators -XNoStarIsType -XScopedTypeVariables `
   -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeOperators `
   -XViewPatterns -XNoPolyKinds -DDEBUG `
   Clash.hs
diff --git a/clash-ghc/cbits/PosixSource.h b/clash-ghc/cbits/PosixSource.h
@@ -38,17 +38,4 @@
 #define _XOPEN_SOURCE   700
 #endif
 
-#if defined(mingw32_HOST_OS)
-/* Without this gcc will warn about %ull and the like since some msvcrt versions
-   do not support them. See
-   https://sourceforge.net/p/mingw-w64/mailman/message/28557333/
-
-   Note that this is implied by _POSIX_C_SOURCE in the msys2 toolchain that we
-   now use. However, we retain this explicit #define to preserve the ability to
-   bootstrap GHC with compilers still using msys (e.g. GHC 7.10.1 and 7.10.2).
-   This can be removed in for GHC 8.4. See #12951.
-  */
-#define __USE_MINGW_ANSI_STDIO 1
-#endif
-
 #endif /* POSIXSOURCE_H */
diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal
@@ -118,9 +118,6 @@ common common-options
                       TypeOperators
                       ViewPatterns
 
-  if impl(ghc >= 8.6)
-      default-extensions: NoStarIsType
-
 library
   import:             common-options
   HS-Source-Dirs:     src-ghc, src-bin-common

diff --git a/clash-lib-hedgehog/clash-lib-hedgehog.cabal b/clash-lib-hedgehog/clash-lib-hedgehog.cabal
@@ -23,10 +23,7 @@ common basic-config
     TypeApplications
     TypeFamilies
     TypeOperators
-
-  if impl(ghc >= 8.6)
-    default-extensions:
-      NoStarIsType
+    NoStarIsType
 
   ghc-options:
     -Wall -Wcompat

diff --git a/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal b/clash-prelude-hedgehog/clash-prelude-hedgehog.cabal
@@ -23,10 +23,7 @@ common basic-config
     TypeApplications
     TypeFamilies
     TypeOperators
-
-  if impl(ghc >= 8.6)
-    default-extensions:
-      NoStarIsType
+    NoStarIsType
 
   ghc-options:
     -Wall -Wcompat

diff --git a/hie.yaml b/hie.yaml
@@ -15,8 +15,6 @@ cradle:
     # The src-bin directories are GHC version dependant, so don't load them
     - path: "./clash-ghc/src-bin-8.10"
       config: { cradle: {none: }}
-    - path: "./clash-ghc/src-bin-841"
-      config: { cradle: {none: }}
     - path: "./clash-ghc/src-bin-861"
       config: { cradle: {none: }}
     - path: "./clash-ghc/src-bin-881"