[Git][haskell-team/DHG_packages][master] 3 commits: ghc: Upgrading from 8.8.3 to 8.8.4
Ilias Tsitsimpis
gitlab at salsa.debian.org
Tue Aug 11 16:06:20 BST 2020
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
dada5da8 by Ilias Tsitsimpis at 2020-08-11T16:45:05+03:00
ghc: Upgrading from 8.8.3 to 8.8.4
- - - - -
057b2d6f by Ilias Tsitsimpis at 2020-08-11T18:04:29+03:00
ghc: Fix FFI on unregisterised big endian machines
- - - - -
3bb3f276 by Ilias Tsitsimpis at 2020-08-11T18:04:31+03:00
ghc: Refresh patches
- - - - -
14 changed files:
- p/ghc/debian/changelog
- p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
- p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
- p/ghc/debian/patches/ARM-VFPv3D16
- p/ghc/debian/patches/buildpath-abi-stability.patch
- + p/ghc/debian/patches/fix-big-endian-ffi
- p/ghc/debian/patches/kfreebsd-aclocal.m4
- p/ghc/debian/patches/llvm-9.patch
- p/ghc/debian/patches/local-mathjax
- p/ghc/debian/patches/no-missing-haddock-file-warning
- p/ghc/debian/patches/series
- p/ghc/debian/patches/use-debian-gen_contents_index
- p/ghc/debian/patches/use-stage1-binaries-for-install.patch
- p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
Changes:
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,12 +1,14 @@
-ghc (8.8.3-4) UNRELEASED; urgency=medium
+ghc (8.8.4-1) unstable; urgency=medium
+ * New upstream release
* Fix gen_contents_index to use ghc-pkg to parse the package database
(Closes: #966069)
* Use locally-installed MathJax.js when generating library docs
(Closes: #890627)
* Patch Haddock to remove hard-coded googleapis font URL (Closes: #963690)
+ * Backport upstream patch to fix FFI on unregisterised big endian machines
- -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 07 Aug 2020 18:31:56 +0300
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 11 Aug 2020 17:12:43 +0300
ghc (8.8.3-3) unstable; urgency=medium
=====================================
p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
=====================================
@@ -9,10 +9,10 @@ Subject: [PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
testsuite/tests/codeGen/should_run/T7600.hs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
-Index: ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+Index: b/libraries/base/GHC/ByteOrder.hs
===================================================================
---- ghc-8.8.3.orig/libraries/base/GHC/ByteOrder.hs
-+++ ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+--- a/libraries/base/GHC/ByteOrder.hs
++++ b/libraries/base/GHC/ByteOrder.hs
@@ -18,7 +18,7 @@
module GHC.ByteOrder where
@@ -22,10 +22,10 @@ Index: ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
-- | Byte ordering.
data ByteOrder
-Index: ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+Index: b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
===================================================================
---- ghc-8.8.3.orig/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-+++ ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+--- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
++++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
@@ -8,7 +8,7 @@ module GHC.IO.Encoding.CodePage.API (
) where
=====================================
p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
=====================================
@@ -12,10 +12,10 @@ with commit 6c59cc71dc).
testsuite/tests/codeGen/should_run/T7600.hs | 4 ++++
3 files changed, 10 insertions(+)
-Index: ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+Index: b/libraries/base/GHC/ByteOrder.hs
===================================================================
---- ghc-8.8.3.orig/libraries/base/GHC/ByteOrder.hs
-+++ ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+--- a/libraries/base/GHC/ByteOrder.hs
++++ b/libraries/base/GHC/ByteOrder.hs
@@ -17,6 +17,9 @@
module GHC.ByteOrder where
@@ -26,10 +26,10 @@ Index: ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
-- | Byte ordering.
data ByteOrder
= BigEndian -- ^ most-significant-byte occurs in lowest address.
-Index: ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+Index: b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
===================================================================
---- ghc-8.8.3.orig/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-+++ ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+--- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
++++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
@@ -7,6 +7,9 @@ module GHC.IO.Encoding.CodePage.API (
mkCodePageEncoding
) where
=====================================
p/ghc/debian/patches/ARM-VFPv3D16
=====================================
@@ -6,11 +6,11 @@ Author: Jani Monoses <jani at ubuntu.com>
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
-Index: ghc-8.8.1+dfsg1/aclocal.m4
+Index: b/aclocal.m4
===================================================================
---- ghc-8.8.1+dfsg1.orig/aclocal.m4
-+++ ghc-8.8.1+dfsg1/aclocal.m4
-@@ -454,7 +454,7 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
)],
[changequote(, )dnl
ARM_ISA=ARMv7
=====================================
p/ghc/debian/patches/buildpath-abi-stability.patch
=====================================
@@ -1,10 +1,10 @@
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
-Index: ghc-8.8.1+dfsg1/compiler/iface/MkIface.hs
+Index: b/compiler/iface/MkIface.hs
===================================================================
---- ghc-8.8.1+dfsg1.orig/compiler/iface/MkIface.hs
-+++ ghc-8.8.1+dfsg1/compiler/iface/MkIface.hs
-@@ -713,7 +713,7 @@
+--- a/compiler/iface/MkIface.hs
++++ b/compiler/iface/MkIface.hs
+@@ -713,7 +713,7 @@ addFingerprints hsc_env mb_old_fingerpri
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -13,7 +13,7 @@ Index: ghc-8.8.1+dfsg1/compiler/iface/MkIface.hs
sorted_deps,
mi_hpc iface0)
-@@ -748,6 +748,9 @@
+@@ -748,6 +748,9 @@ addFingerprints hsc_env mb_old_fingerpri
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
=====================================
p/ghc/debian/patches/fix-big-endian-ffi
=====================================
@@ -0,0 +1,67 @@
+From 01f7052cc182c0ced85522dc775ebc490bf094ce Mon Sep 17 00:00:00 2001
+From: Peter Trommler <ptrommler at acm.org>
+Date: Thu, 11 Jun 2020 08:31:22 +0200
+Subject: [PATCH] FFI: Fix pass small ints in foreign call wrappers
+
+The Haskell calling convention requires integer parameters smaller
+than wordsize to be promoted to wordsize (where the upper bits are
+don't care). To access such small integer parameter read a word from
+the parameter array and then cast that word to the small integer
+target type.
+
+Fixes #15933
+---
+
+Index: b/compiler/deSugar/DsForeign.hs
+===================================================================
+--- a/compiler/deSugar/DsForeign.hs
++++ b/compiler/deSugar/DsForeign.hs
+@@ -524,20 +524,43 @@ mkFExportCBits dflags c_nm maybe_target
+ -- use that instead. I hope the two coincide --SDM
+ )
+ where
++ platform = targetPlatform dflags
++
+ -- list the arguments to the C function
+ arg_info :: [(SDoc, -- arg name
+ SDoc, -- C type
+ Type, -- Haskell type
+ CmmType)] -- the CmmType
+- arg_info = [ let stg_type = showStgType ty in
+- (arg_cname n stg_type,
++ arg_info = [ let stg_type = showStgType ty
++ cmm_type = typeCmmType dflags (getPrimTyOf ty)
++ stack_type
++ = if int_promote (typeTyCon ty)
++ then text "HsWord"
++ else stg_type
++ in
++ (arg_cname n stg_type stack_type,
+ stg_type,
+ ty,
+- typeCmmType dflags (getPrimTyOf ty))
++ cmm_type)
+ | (ty,n) <- zip arg_htys [1::Int ..] ]
+
+- arg_cname n stg_ty
+- | libffi = char '*' <> parens (stg_ty <> char '*') <>
++ int_promote ty_con
++ | ty_con `hasKey` int8TyConKey = True
++ | ty_con `hasKey` int16TyConKey = True
++ | ty_con `hasKey` int32TyConKey
++ , platformWordSize platform > 4
++ = True
++ | ty_con `hasKey` word8TyConKey = True
++ | ty_con `hasKey` word16TyConKey = True
++ | ty_con `hasKey` word32TyConKey
++ , platformWordSize platform > 4
++ = True
++ | otherwise = False
++
++
++ arg_cname n stg_ty stack_ty
++ | libffi = parens (stg_ty) <> char '*' <>
++ parens (stack_ty <> char '*') <>
+ text "args" <> brackets (int (n-1))
+ | otherwise = text ('a':show n)
+
=====================================
p/ghc/debian/patches/kfreebsd-aclocal.m4
=====================================
@@ -2,11 +2,11 @@ Description: Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Author: Svante Signell <svante.signell at gmail.com>
Bug-Debian: https://bugs.debian.org/913140
-Index: ghc-8.8.1+dfsg1/aclocal.m4
+Index: b/aclocal.m4
===================================================================
---- ghc-8.8.1+dfsg1.orig/aclocal.m4
-+++ ghc-8.8.1+dfsg1/aclocal.m4
-@@ -2048,7 +2048,7 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -2048,7 +2048,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
$3="openbsd"
;;
# As far as I'm aware, none of these have relevant variants
@@ -15,7 +15,7 @@ Index: ghc-8.8.1+dfsg1/aclocal.m4
$3="$1"
;;
msys)
-@@ -2068,6 +2068,9 @@
+@@ -2068,6 +2068,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
# i686-gentoo-freebsd8.2
$3="freebsd"
;;
=====================================
p/ghc/debian/patches/llvm-9.patch
=====================================
@@ -56,7 +56,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -641,7 +641,7 @@ AC_SUBST([LibtoolCmd])
+@@ -655,7 +655,7 @@ AC_SUBST([LibtoolCmd])
# tools we are looking for. In the past, GHC supported a number of
# versions of LLVM simultaneously, but that stopped working around
# 3.5/3.6 release of LLVM.
=====================================
p/ghc/debian/patches/local-mathjax
=====================================
@@ -1,6 +1,8 @@
+Index: b/docs/users_guide/conf.py
+===================================================================
--- a/docs/users_guide/conf.py
+++ b/docs/users_guide/conf.py
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ html_use_opensearch = 'https://downloads
html_show_copyright = True
# See GHC #15006
=====================================
p/ghc/debian/patches/no-missing-haddock-file-warning
=====================================
@@ -3,11 +3,11 @@ Description: Do not emit a warning if the .haddock file is missing
without the -doc package.
Author: Joachim Breitner <nomeata at debian.org>
-Index: ghc-8.8.1+dfsg1/utils/ghc-pkg/Main.hs
+Index: b/utils/ghc-pkg/Main.hs
===================================================================
---- ghc-8.8.1+dfsg1.orig/utils/ghc-pkg/Main.hs
-+++ ghc-8.8.1+dfsg1/utils/ghc-pkg/Main.hs
-@@ -1889,8 +1889,10 @@
+--- a/utils/ghc-pkg/Main.hs
++++ b/utils/ghc-pkg/Main.hs
+@@ -1889,8 +1889,10 @@ checkPackageConfig pkg verbosity db_stac
mapM_ (checkDir True "dynamic-library-dirs") (libraryDynDirs pkg)
mapM_ (checkDir True "include-dirs") (includeDirs pkg)
mapM_ (checkDir True "framework-dirs") (frameworkDirs pkg)
=====================================
p/ghc/debian/patches/series
=====================================
@@ -13,3 +13,4 @@ fix-32bit-atomic
3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
11f8eef5a9625c77f78a829406c446b615ed6168.patch
haddock-remove-googleapis-fonts
+fix-big-endian-ffi
=====================================
p/ghc/debian/patches/use-debian-gen_contents_index
=====================================
@@ -1,8 +1,8 @@
-Index: ghc-8.8.1+dfsg1/ghc.mk
+Index: b/ghc.mk
===================================================================
---- ghc-8.8.1+dfsg1.orig/ghc.mk
-+++ ghc-8.8.1+dfsg1/ghc.mk
-@@ -811,7 +811,6 @@
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -811,7 +811,6 @@ endif
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,7 +10,7 @@ Index: ghc-8.8.1+dfsg1/ghc.mk
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
-@@ -944,12 +943,8 @@
+@@ -944,12 +943,8 @@ endif
$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,7 +24,7 @@ Index: ghc-8.8.1+dfsg1/ghc.mk
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -1070,7 +1065,6 @@
+@@ -1070,7 +1065,6 @@ $(eval $(call bindist-list,.,\
mk/project.mk \
mk/install.mk.in \
bindist.mk \
=====================================
p/ghc/debian/patches/use-stage1-binaries-for-install.patch
=====================================
@@ -7,11 +7,11 @@ Description: Use the stage1 binaries for install
Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
Last-Update: 2017-01-29
-Index: ghc-8.8.1+dfsg1/ghc.mk
+Index: b/ghc.mk
===================================================================
---- ghc-8.8.1+dfsg1.orig/ghc.mk
-+++ ghc-8.8.1+dfsg1/ghc.mk
-@@ -963,8 +963,12 @@
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -963,8 +963,12 @@ else # CrossCompiling
# Install packages in the right order, so that ghc-pkg doesn't complain.
# Also, install ghc-pkg first.
ifeq "$(Windows_Host)" "NO"
=====================================
p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
=====================================
@@ -12,10 +12,10 @@ Description: Use native x86_64 instructions on x32
See: https://ghc.haskell.org/trac/ghc/ticket/11571
.
-Index: ghc-8.8.1+dfsg1/rts/RtsSymbols.c
+Index: b/rts/RtsSymbols.c
===================================================================
---- ghc-8.8.1+dfsg1.orig/rts/RtsSymbols.c
-+++ ghc-8.8.1+dfsg1/rts/RtsSymbols.c
+--- a/rts/RtsSymbols.c
++++ b/rts/RtsSymbols.c
@@ -938,7 +938,7 @@
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/f8c5182c509e68edbbed2d6d40a1c5fd2b1c6a4e...3bb3f27694910bf7c9e9b0c33fa07daa832717a0
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/f8c5182c509e68edbbed2d6d40a1c5fd2b1c6a4e...3bb3f27694910bf7c9e9b0c33fa07daa832717a0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200811/0c104873/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list