[commit: ghc] master: Forward-port changes from GHC 8.2 branch (5f332e1)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f332e1dab000e1f79c127d441f618280d14d2bd/ghc

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

commit 5f332e1dab000e1f79c127d441f618280d14d2bd
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 7 09:58:00 2017 +0100

    Forward-port changes from GHC 8.2 branch
    
    (cherry picked from commit 3fa061a647d2fdc182eff9296eea02d6a7d516cd)


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

5f332e1dab000e1f79c127d441f618280d14d2bd
 libraries/base/base.cabal               | 10 +++++-----
 libraries/base/changelog.md             |  8 ++++++++
 libraries/ghci/changelog.md             |  4 ++++
 libraries/integer-gmp/integer-gmp.cabal | 13 +++++++++++--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 8817f69..4252cdc 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -9,11 +9,11 @@ maintainer:     libraries at haskell.org
 bug-reports:    http://ghc.haskell.org/trac/ghc/newticket?component=libraries/base
 synopsis:       Basic libraries
 category:       Prelude
+build-type:     Configure
 description:
-    This package contains the "Prelude" and its support libraries,
+    This package contains the Standard Haskell "Prelude" and its support libraries,
     and a large collection of useful libraries ranging from data
     structures to parsing combinators and debugging utilities.
-build-type:     Configure
 
 extra-tmp-files:
     autom4te.cache
@@ -94,17 +94,17 @@ Library
         UnliftedFFITypes
         Unsafe
 
-    build-depends: rts == 1.0.*, ghc-prim == 0.5.*
+    build-depends: rts == 1.0, ghc-prim ^>= 0.5.1.0
 
     -- sanity-check to ensure exactly one flag is set
     if !((flag(integer-gmp) && !flag(integer-simple)) || (!flag(integer-gmp) && flag(integer-simple)))
         build-depends: invalid-cabal-flag-settings<0
 
     if flag(integer-simple)
-        build-depends: integer-simple >= 0.1.1 && < 0.2
+        build-depends: integer-simple ^>= 0.1.1
 
     if flag(integer-gmp)
-        build-depends: integer-gmp >= 1.0 && < 1.1
+        build-depends: integer-gmp ^>= 1.0.1
         cpp-options: -DOPTIMISE_INTEGER_GCD_LCM
 
     exposed-modules:
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 7e3c1b0..e908475 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -73,6 +73,14 @@
 
   * `getExecutablePath` now resolves symlinks on Windows (#14483)
 
+## 4.10.1.0 *November 2017*
+  * Bundled with GHC 8.2.2
+
+  * The file locking primitives provided by `GHC.IO.Handle` now use
+    Linux open file descriptor locking if available.
+
+  * Fixed bottoming definition of `clearBit` for `Natural`
+
 ## 4.10.0.0 *July 2017*
   * Bundled with GHC 8.2.1
 
diff --git a/libraries/ghci/changelog.md b/libraries/ghci/changelog.md
index 3775eda..9ced829 100644
--- a/libraries/ghci/changelog.md
+++ b/libraries/ghci/changelog.md
@@ -1,3 +1,7 @@
+## 8.2.2 Nov 2017
+
+  * Bundled with GHC 8.2.2
+
 ## 8.0.1  *Feb 2016*
 
   * Bundled with GHC 8.0.1
diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal
index 2f32b34..6edacea 100644
--- a/libraries/integer-gmp/integer-gmp.cabal
+++ b/libraries/integer-gmp/integer-gmp.cabal
@@ -1,5 +1,7 @@
+cabal-version:       2.0
 name:                integer-gmp
 version:             1.0.1.0
+
 synopsis:            Integer library based on GMP
 license:             BSD3
 license-file:        LICENSE
@@ -7,7 +9,14 @@ author:              Herbert Valerio Riedel
 maintainer:          hvr at gnu.org
 category:            Numeric, Algebra
 build-type:          Configure
-cabal-version:       >=1.10
+description:
+    This package provides the low-level implementation of the standard
+    'Integer' type based on the
+    <http://gmplib.org/ GNU Multiple Precision Arithmetic Library (GMP)>.
+    .
+    This package provides access to the internal representation of
+    'Integer' as well as primitive operations with no proper error
+    handling, and should only be used directly with the utmost care.
 
 extra-source-files:
     aclocal.m4
@@ -46,7 +55,7 @@ library
     StandaloneDeriving
     UnboxedTuples
     UnliftedFFITypes
-  build-depends:       ghc-prim
+  build-depends:       ghc-prim ^>= 0.5.1.0
   hs-source-dirs:      src/
   ghc-options: -this-unit-id integer-gmp -Wall
   cc-options: -std=c99 -Wall