[commit: ghc] wip/T9281: Rename GHC.Integer.GMP2.Internals to *.GMP.* (40c2037)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T9281
Link       : http://ghc.haskell.org/trac/ghc/changeset/40c203746cec3cf17d5af00b8f0b9b57cece9bb4/ghc

>---------------------------------------------------------------

commit 40c203746cec3cf17d5af00b8f0b9b57cece9bb4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 9 21:35:47 2014 +0100

    Rename GHC.Integer.GMP2.Internals to *.GMP.*


>---------------------------------------------------------------

40c203746cec3cf17d5af00b8f0b9b57cece9bb4
 libraries/base/GHC/Real.hs                                        | 4 +---
 libraries/integer-gmp2/integer-gmp2.cabal                         | 2 +-
 libraries/integer-gmp2/src/GHC/Integer.hs                         | 2 +-
 libraries/integer-gmp2/src/GHC/Integer/{GMP2 => GMP}/Internals.hs | 4 ++--
 testsuite/tests/simplCore/should_run/T5603.hs                     | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libraries/base/GHC/Real.hs b/libraries/base/GHC/Real.hs
index efdb74d..2b5f6cc 100644
--- a/libraries/base/GHC/Real.hs
+++ b/libraries/base/GHC/Real.hs
@@ -27,10 +27,8 @@ import GHC.Show
 import {-# SOURCE #-} GHC.Exception( divZeroException, overflowException, ratioZeroDenomException )
 
 #ifdef OPTIMISE_INTEGER_GCD_LCM
-# if defined(MIN_VERSION_integer_gmp)
+# if defined(MIN_VERSION_integer_gmp) || defined(MIN_VERSION_integer_gmp2)
 import GHC.Integer.GMP.Internals
-# elif defined(MIN_VERSION_integer_gmp2)
-import GHC.Integer.GMP2.Internals
 # else
 #  error unsupported OPTIMISE_INTEGER_GCD_LCM configuration
 # endif
diff --git a/libraries/integer-gmp2/integer-gmp2.cabal b/libraries/integer-gmp2/integer-gmp2.cabal
index 2727845..950cbff 100644
--- a/libraries/integer-gmp2/integer-gmp2.cabal
+++ b/libraries/integer-gmp2/integer-gmp2.cabal
@@ -58,7 +58,7 @@ library
     GHC.Integer.Logarithms
     GHC.Integer.Logarithms.Internals
 
-    GHC.Integer.GMP2.Internals
+    GHC.Integer.GMP.Internals
 
   other-modules:
     GHC.Integer.Type
diff --git a/libraries/integer-gmp2/src/GHC/Integer.hs b/libraries/integer-gmp2/src/GHC/Integer.hs
index 2335a5d..c9675f5 100644
--- a/libraries/integer-gmp2/src/GHC/Integer.hs
+++ b/libraries/integer-gmp2/src/GHC/Integer.hs
@@ -16,7 +16,7 @@
 -- The 'Integer' type.
 --
 -- This module exposes the /portable/ 'Integer' API.  See
--- "GHC.Integer.GMP2.Internals" for the @integer-gmp2 at -specific internal
+-- "GHC.Integer.GMP.Internals" for the @integer-gmp2 at -specific internal
 -- representation of 'Integer' as well as optimized GMP-specific
 -- operations.
 
diff --git a/libraries/integer-gmp2/src/GHC/Integer/GMP2/Internals.hs b/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
similarity index 97%
rename from libraries/integer-gmp2/src/GHC/Integer/GMP2/Internals.hs
rename to libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
index 6e4a25f..e4169e7 100644
--- a/libraries/integer-gmp2/src/GHC/Integer/GMP2/Internals.hs
+++ b/libraries/integer-gmp2/src/GHC/Integer/GMP/Internals.hs
@@ -12,7 +12,7 @@
 #include "MachDeps.h"
 
 -- |
--- Module      :  GHC.Integer.GMP2.Internals
+-- Module      :  GHC.Integer.GMP.Internals
 -- Copyright   :  (c) Herbert Valerio Riedel 2014
 -- License     :  BSD3
 --
@@ -31,7 +31,7 @@
 -- See also
 -- <https://ghc.haskell.org/trac/ghc/wiki/Commentary/Libraries/Integer GHC Commentary: Libraries/Integer>.
 
-module GHC.Integer.GMP2.Internals
+module GHC.Integer.GMP.Internals
     ( -- * The 'Integer' type
       Integer(..)
     , isValidInteger#
diff --git a/testsuite/tests/simplCore/should_run/T5603.hs b/testsuite/tests/simplCore/should_run/T5603.hs
index 846a33f..0d3d25f 100644
--- a/testsuite/tests/simplCore/should_run/T5603.hs
+++ b/testsuite/tests/simplCore/should_run/T5603.hs
@@ -4,7 +4,7 @@
 module Main (main) where
 
 import GHC.Base
-import GHC.Integer.GMP2.Internals
+import GHC.Integer.GMP.Internals
 
 main :: IO ()
 main = (encodeDouble 0 :: Double) `seq` return ()