diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-10-09 12:39:14 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-10-09 12:40:23 -0400 |
| commit | d728c3c578cc9e9205def2c1e96934487b364b7b (patch) | |
| tree | c542d0ea89dad09c0b8a887266375e4303f9a3a6 /libraries | |
| parent | 4eeeb51d5f51083d0ae393009a7fd246223e9791 (diff) | |
| download | haskell-d728c3c578cc9e9205def2c1e96934487b364b7b.tar.gz | |
Revert "Add Int8# and Word8#"
This unfortunately broke i386 support since it introduced references to
byte-sized registers that don't exist on that architecture.
Reverts binary submodule
This reverts commit 5d5307f943d7581d7013ffe20af22233273fba06.
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/base/Data/Typeable/Internal.hs | 4 | ||||
| m--------- | libraries/binary | 0 | ||||
| -rw-r--r-- | libraries/ghc-prim/GHC/Types.hs | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/libraries/base/Data/Typeable/Internal.hs b/libraries/base/Data/Typeable/Internal.hs index 821fffcf81..0d4fc825cf 100644 --- a/libraries/base/Data/Typeable/Internal.hs +++ b/libraries/base/Data/Typeable/Internal.hs @@ -664,10 +664,8 @@ runtimeRepTypeRep r = SumRep rs -> kindedTypeRep @_ @'SumRep `kApp` buildList (map runtimeRepTypeRep rs) IntRep -> rep @'IntRep - Int8Rep -> rep @'Int8Rep - Int64Rep -> rep @'Int64Rep WordRep -> rep @'WordRep - Word8Rep -> rep @'Word8Rep + Int64Rep -> rep @'Int64Rep Word64Rep -> rep @'Word64Rep AddrRep -> rep @'AddrRep FloatRep -> rep @'FloatRep diff --git a/libraries/binary b/libraries/binary -Subproject 0318374b832ebe52a8d01bff2dd7bab8e747fbd +Subproject 38adf7ce1ad6a497fba61de500c3f35b186303a diff --git a/libraries/ghc-prim/GHC/Types.hs b/libraries/ghc-prim/GHC/Types.hs index 7ab870684d..d06c0be307 100644 --- a/libraries/ghc-prim/GHC/Types.hs +++ b/libraries/ghc-prim/GHC/Types.hs @@ -394,10 +394,8 @@ data RuntimeRep = VecRep VecCount VecElem -- ^ a SIMD vector type | LiftedRep -- ^ lifted; represented by a pointer | UnliftedRep -- ^ unlifted; represented by a pointer | IntRep -- ^ signed, word-sized value - | Int8Rep -- ^ signed, 8-bit value - | Int64Rep -- ^ signed, 64-bit value (on 32-bit only) | WordRep -- ^ unsigned, word-sized value - | Word8Rep -- ^ unsigned, 8-bit value + | Int64Rep -- ^ signed, 64-bit value (on 32-bit only) | Word64Rep -- ^ unsigned, 64-bit value (on 32-bit only) | AddrRep -- ^ A pointer, but /not/ to a Haskell value | FloatRep -- ^ a 32-bit floating point number |