[Git][haskell-team/DHG_packages][master] 42 commits: ghc: update to version 8.10.1, drop llvm-9 patch: upstream and refresh other patches
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Fri Jun 10 11:18:46 BST 2022
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
88a51b4d by Gianfranco Costamagna at 2020-05-28T13:57:05+02:00
ghc: update to version 8.10.1, drop llvm-9 patch: upstream and refresh other patches
- - - - -
bcb088c9 by Gianfranco Costamagna at 2020-07-22T10:55:56+02:00
Merge branch 'master' into experimental
- - - - -
5888ba91 by Gianfranco Costamagna at 2020-07-22T10:56:27+02:00
ghc: refresh patches
- - - - -
6d9f0a0c by Gianfranco Costamagna at 2020-08-18T15:03:25+02:00
Merge branch 'master' into experimental
- - - - -
8651c6a4 by Gianfranco Costamagna at 2020-08-18T15:06:53+02:00
ghc: merge changes for 8.8.4
- - - - -
dae72f84 by Gianfranco Costamagna at 2020-08-19T00:23:37+02:00
ghc: update to 8.10.2
- - - - -
851252a5 by Gianfranco Costamagna at 2020-08-19T00:27:03+02:00
ghc: apply changes in 8.8.4-2
- - - - -
114d8edb by Gianfranco Costamagna at 2020-08-19T00:30:53+02:00
Merge branch 'master' into experimental
- - - - -
c340fa92 by Gianfranco Costamagna at 2020-08-20T12:22:01+02:00
ghc: drop for now the big endian patch
- - - - -
7785f9ef by Gianfranco Costamagna at 2020-08-21T15:42:59+02:00
Merge branch 'master' into experimental
- - - - -
e4c5ebdc by Gianfranco Costamagna at 2020-12-23T22:57:08+01:00
Merge branch 'master' into experimental
- - - - -
c2c8171a by Gianfranco Costamagna at 2020-12-23T23:26:02+01:00
Upload to experimental
- - - - -
01b776a3 by Gianfranco Costamagna at 2020-12-25T23:02:26+01:00
ghc: update to 8.10.3
- - - - -
bd93bcb0 by Gianfranco Costamagna at 2021-02-14T11:05:02+01:00
ghc: update to 8.10.4
- - - - -
263f6d4d by Clint Adams at 2021-08-24T07:33:12-04:00
Merge branch 'master' into experimental
- - - - -
292b9a3e by Clint Adams at 2021-08-24T08:10:53-04:00
GHC 8.10.6
- - - - -
0309e197 by Clint Adams at 2021-08-24T12:35:29-04:00
tweak
- - - - -
b71043bd by Gianfranco Costamagna at 2021-08-26T08:40:07+02:00
ghc: drop patches 11f8eef5a9625c77f78a829406c446b615ed6168 and 3c12355ece0fa14e534c71a9f7327eda9773fad9
now part of upstream codebase
- - - - -
3e24bed7 by Clint Adams at 2021-08-26T08:29:38-04:00
build with llvm-12 on s390x too
- - - - -
9289b99a by Gianfranco Costamagna at 2021-08-26T15:31:24+02:00
ghc: add patch from Fedora to suppress build warnings on s390x architecture, making the log too huge to be viewable
- - - - -
2bc1dfc1 by Gianfranco Costamagna at 2021-08-26T15:31:24+02:00
ghc: apply patch only on s390x architecture for now
- - - - -
6b295d6e by Gianfranco Costamagna at 2021-08-26T15:31:24+02:00
ghc: update changelog
- - - - -
43e8d4c3 by Clint Adams at 2021-08-26T09:54:16-04:00
armel llvm feature flag update from Ilias
- - - - -
5fd20564 by Clint Adams at 2021-08-26T09:54:52-04:00
changelog bump
- - - - -
c23fb941 by Gianfranco Costamagna at 2021-08-26T16:11:36+02:00
ghc: explain script used to generate llvm-arm-unknown-linux-gnueabi data patch
- - - - -
5321dcca by Clint Adams at 2021-08-26T14:08:55-04:00
missing parenthesis
- - - - -
078e3aa4 by Ilias Tsitsimpis at 2021-10-16T15:00:58+03:00
Merge branch 'master' into experimental
- - - - -
1ed7207e by Ilias Tsitsimpis at 2021-10-16T15:14:52+03:00
ghc: New upstream release (8.10.7)
- - - - -
c388b133 by Ilias Tsitsimpis at 2021-10-16T15:17:04+03:00
ghc: Add new upstream GPG key
- - - - -
c42baf8c by Ilias Tsitsimpis at 2021-10-16T15:19:24+03:00
ghc: Drop patches applied upstream
- - - - -
51623844 by Ilias Tsitsimpis at 2021-10-16T15:38:13+03:00
ghc: Re-enable fix-big-endian-ffi patch
- - - - -
a030d1e3 by Ilias Tsitsimpis at 2021-10-24T14:55:29+03:00
ghc: Fix compilation on armel
- - - - -
39130922 by Ilias Tsitsimpis at 2021-10-24T14:55:47+03:00
ghc: Fix linker relocation errors on mips64el
- - - - -
caef9440 by Ilias Tsitsimpis at 2021-10-24T15:04:24+03:00
ghc: Switch to unregistered build on i386
>From GHC 8.10 and later, native code generator support for legacy x87
floating point coprocessor has been removed. GHC now only support
floating point via SSE2. This causes a baseline violation on Debian for
i386 where there is no SSE support. Fallback to unregisterised builds on
i386.
- - - - -
fd9fd105 by Gianfranco Costamagna at 2022-01-21T11:22:27+01:00
ghc: lower parallelism on mipsel to 2, this might address the OOM
- - - - -
5d8c1a51 by Gianfranco Costamagna at 2022-02-04T09:53:31+01:00
ghc: Revert mipsel change, didn't fix the build failure
- - - - -
3e019c35 by Ilias Tsitsimpis at 2022-05-30T15:36:34+03:00
Merge branch 'master' into experimental
- - - - -
11af9472 by Ilias Tsitsimpis at 2022-05-30T15:42:51+03:00
ghc: New upstream release (9.0.2)
- - - - -
539af804 by Ilias Tsitsimpis at 2022-06-03T10:53:04+03:00
ghc: Refresh patches
- - - - -
b11d6d95 by Ilias Tsitsimpis at 2022-06-03T11:25:15+03:00
ghc: Upload to experimental
- - - - -
c5d0b723 by Ilias Tsitsimpis at 2022-06-10T12:42:14+03:00
Merge branch 'experimental'
- - - - -
d0b7b8ad by Ilias Tsitsimpis at 2022-06-10T12:49:44+03:00
ghc: Upload to unstable
- - - - -
27 changed files:
- p/ghc/debian/changelog
- p/ghc/debian/control
- − 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-32bit-atomic
- − p/ghc/debian/patches/fix-big-endian-ffi
- − p/ghc/debian/patches/fix-build-using-unregisterised-v8.6
- + p/ghc/debian/patches/fix-llvm-armel
- + p/ghc/debian/patches/ghc-warnings.mk-CC-Wall.patch
- p/ghc/debian/patches/haddock-remove-googleapis-fonts
- p/ghc/debian/patches/kfreebsd-aclocal.m4
- + p/ghc/debian/patches/latomic-64bit
- + p/ghc/debian/patches/latomic-subword
- − p/ghc/debian/patches/llvm-11.patch
- − p/ghc/debian/patches/llvm-arm-unknown-linux-gnueabi.patch
- p/ghc/debian/patches/local-mathjax
- − p/ghc/debian/patches/newer-autoconf
- − p/ghc/debian/patches/newer-sphinx
- 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
- p/ghc/debian/rules
- p/ghc/debian/upstream/signing-key.asc
Changes:
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,88 @@
+ghc (9.0.2-1) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Remove Joachim Breitner from uploaders.
+ * Drop libncurses5-dev dep in favor of libncurses-dev (Closes: #998348).
+ * Update to llvm-12 (Closes: #1000929).
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 10 Jun 2022 12:49:38 +0300
+
+ghc (9.0.2-1~exp1) experimental; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * Revert last change on mipsel, didn't fix the failure
+
+ [ Ilias Tsitsimpis ]
+ * New upstream release.
+ * Refresh patches.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Fri, 03 Jun 2022 11:25:00 +0300
+
+ghc (8.10.7-1~exp2) experimental; urgency=medium
+
+ * Lower parallelism builds to 2 on mipsel
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Fri, 21 Jan 2022 11:20:56 +0100
+
+ghc (8.10.7-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Add upstream GPG key used to sign the tarballs.
+ * Drop patches applied upstream.
+ * Refresh and re-enable 'fix-big-endian-ffi' patch.
+ * Fix compilation on armel.
+ * Fix linker relocation errors on mips64el.
+ * Switch to unregistered build on i386 to avoid a baseline violation.
+ Thanks to Adrian Bunk for the patch.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 24 Oct 2021 15:03:50 +0300
+
+ghc (8.10.6-1~exp4) experimental; urgency=medium
+
+ * Drop some patches now upstream.
+ * Add a patch from Fedora to avoid too much logs on s390x.
+ * Enable unregisterised builds on s390x
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 26 Aug 2021 12:00:34 +0200
+
+ghc (8.10.4-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Sun, 14 Feb 2021 11:02:03 +0100
+
+ghc (8.10.3-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 24 Dec 2020 23:10:52 +0100
+
+ghc (8.10.2-1~exp3) experimental; urgency=medium
+
+ * Upload to experimental with changes from 8.8.4-2
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Wed, 23 Dec 2020 23:20:54 +0100
+
+ghc (8.10.2-1~exp2) experimental; urgency=medium
+
+ * Drop FFI patch, makes the package FTBFS everywhere
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Wed, 19 Aug 2020 21:32:42 +0200
+
+ghc (8.10.2-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 18 Aug 2020 15:11:31 +0200
+
+ghc (8.10.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release
+ * Drop llvm-9 patch: upstream
+ * Also reduce parallel builds on arm64
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Wed, 27 May 2020 17:46:58 +0200
+
ghc (8.8.4-3) unstable; urgency=medium
* Disable parallel install to fix races with missing directories
=====================================
p/ghc/debian/control
=====================================
@@ -3,7 +3,6 @@ Section: haskell
Priority: optional
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
Uploaders:
- Joachim Breitner <nomeata at debian.org>,
Clint Adams <clint at debian.org>,
Ilias Tsitsimpis <iliastsi at debian.org>
Standards-Version: 4.5.0
@@ -16,9 +15,9 @@ Build-Depends:
pkg-config,
ghc:native (>= 8.6),
libgmp-dev,
- llvm-11 [arm64 armel armhf],
+ llvm-12 [arm64 armel armhf],
libffi-dev,
- libncurses5-dev,
+ libncurses-dev,
python3-sphinx <!cross>,
dpkg-dev (>= 1.16.1.1)
Build-Depends-Indep:
@@ -32,13 +31,13 @@ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/gh
Package: ghc
Architecture: any
Depends:
- llvm-11 [arm64 armel armhf],
+ llvm-12 [arm64 armel armhf],
gcc,
libgmp-dev,
libffi-dev,
libbsd-dev,
libc6-dev,
- libncurses5-dev,
+ libncurses-dev,
${shlibs:Depends},
${misc:Depends}
Pre-Depends: dpkg (>= 1.16.1)
@@ -55,7 +54,7 @@ Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10), ${conflictin
Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8)
Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13),
ghc-doc (<< 7.10), ghc-haddock (<< 7.10), ${conflicting-devs}
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-11
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-12
Description: The Glasgow Haskell Compilation system
The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
Haskell.
=====================================
p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch deleted
=====================================
@@ -1,37 +0,0 @@
-From 11f8eef5a9625c77f78a829406c446b615ed6168 Mon Sep 17 00:00:00 2001
-From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
-Date: Wed, 11 Dec 2019 07:47:16 +0100
-Subject: [PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
-
----
- libraries/base/GHC/ByteOrder.hs | 2 +-
- libraries/base/GHC/IO/Encoding/CodePage/API.hs | 2 +-
- testsuite/tests/codeGen/should_run/T7600.hs | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: b/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
-
- -- Required for WORDS_BIGENDIAN
--#include "ghcautoconf.h"
-+#include <ghcautoconf.h>
-
- -- | Byte ordering.
- data ByteOrder
-Index: b/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
-
- -- Required for WORDS_BIGENDIAN
--#include "ghcautoconf.h"
-+#include <ghcautoconf.h>
-
- import Foreign.C
- import Foreign.Ptr
=====================================
p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch deleted
=====================================
@@ -1,42 +0,0 @@
-From 3c12355ece0fa14e534c71a9f7327eda9773fad9 Mon Sep 17 00:00:00 2001
-From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
-Date: Mon, 9 Dec 2019 15:41:57 +0100
-Subject: [PATCH] Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
-
-Include header file `ghcautoconf.h` where the CPP macro
-`WORDS_BIGENDIAN` is defined. This finally fixes #17337 (in conjunction
-with commit 6c59cc71dc).
----
- libraries/base/GHC/ByteOrder.hs | 3 +++
- libraries/base/GHC/IO/Encoding/CodePage/API.hs | 3 +++
- testsuite/tests/codeGen/should_run/T7600.hs | 4 ++++
- 3 files changed, 10 insertions(+)
-
-Index: b/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
-
-+-- Required for WORDS_BIGENDIAN
-+#include "ghcautoconf.h"
-+
- -- | Byte ordering.
- data ByteOrder
- = BigEndian -- ^ most-significant-byte occurs in lowest address.
-Index: b/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
-
-+-- Required for WORDS_BIGENDIAN
-+#include "ghcautoconf.h"
-+
- import Foreign.C
- import Foreign.Ptr
- import Foreign.Marshal
=====================================
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: b/aclocal.m4
+Index: b/m4/fptools.m4
===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
+--- a/m4/fptools.m4
++++ b/m4/fptools.m4
+@@ -475,7 +475,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: b/compiler/iface/MkIface.hs
+Index: b/compiler/GHC/Iface/Recomp.hs
===================================================================
---- a/compiler/iface/MkIface.hs
-+++ b/compiler/iface/MkIface.hs
-@@ -713,7 +713,7 @@ addFingerprints hsc_env mb_old_fingerpri
+--- a/compiler/GHC/Iface/Recomp.hs
++++ b/compiler/GHC/Iface/Recomp.hs
+@@ -1071,7 +1071,7 @@ addFingerprints hsc_env iface0
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -13,13 +13,12 @@ Index: b/compiler/iface/MkIface.hs
sorted_deps,
mi_hpc iface0)
-@@ -748,6 +748,9 @@ addFingerprints hsc_env mb_old_fingerpri
+@@ -1106,6 +1106,8 @@ addFingerprints hsc_env iface0
+ (non_orph_rules, orph_rules) = mkOrphMap ifRuleOrph (mi_rules iface0)
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
- fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
+ -- Do not allow filenames to affect the interface
+ usages = [ case u of UsageFile _ fp -> UsageFile "" fp; _ -> u | u <- mi_usages iface0 ]
-+
-- | Retrieve the orphan hashes 'mi_orphan_hash' for a list of modules
-- (in particular, the orphan modules which are transitively imported by the
=====================================
p/ghc/debian/patches/fix-32bit-atomic deleted
=====================================
@@ -1,39 +0,0 @@
-Description: Do not define hs_atomic{read,write}64() on non-64bit
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-Bug: https://gitlab.haskell.org/ghc/ghc/issues/17886
-Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2804
-
-Index: b/libraries/ghc-prim/cbits/atomic.c
-===================================================================
---- a/libraries/ghc-prim/cbits/atomic.c
-+++ b/libraries/ghc-prim/cbits/atomic.c
-@@ -361,6 +361,7 @@ hs_atomicread32(StgWord x)
- #endif
- }
-
-+#if WORD_SIZE_IN_BITS == 64
- extern StgWord64 hs_atomicread64(StgWord x);
- StgWord64
- hs_atomicread64(StgWord x)
-@@ -371,6 +372,7 @@ hs_atomicread64(StgWord x)
- return __sync_add_and_fetch((StgWord64 *) x, 0);
- #endif
- }
-+#endif
-
- // AtomicWriteByteArrayOp_Int
- // Implies a full memory barrier (see compiler/prelude/primops.txt.pp)
-@@ -409,6 +411,7 @@ hs_atomicwrite32(StgWord x, StgWord val)
- #endif
- }
-
-+#if WORD_SIZE_IN_BITS == 64
- extern void hs_atomicwrite64(StgWord x, StgWord64 val);
- void
- hs_atomicwrite64(StgWord x, StgWord64 val)
-@@ -420,3 +423,5 @@ hs_atomicwrite64(StgWord x, StgWord64 va
- #endif
- }
- #endif
-+
-+#endif
=====================================
p/ghc/debian/patches/fix-big-endian-ffi deleted
=====================================
@@ -1,67 +0,0 @@
-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/fix-build-using-unregisterised-v8.6 deleted
=====================================
@@ -1,31 +0,0 @@
-Description: Allow unregisterised ghc-8.6 to build newer GHC
- Commit af9b744bbf1 introduced a regression stopping existing unregisterised
- compilers from being able to compile newer versions of GHC. The problem is
- that the bootstrap compiler uses the newer `includes/stg/MiscClosures.h` file
- where some defines have been renamed, resulting in the following error:
-.
- error: ‘stg_atomicModifyMutVarzh’ undeclared (first use in this function); did you mean ‘stg_atomicModifyMutVar2zh’?
-.
- For more information, see https://gitlab.haskell.org/ghc/ghc/issues/17111.
-.
- This patch can be removed, once ghc-8.6 is no longer the bootstrap compiler.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111
-
-Index: b/includes/stg/MiscClosures.h
-===================================================================
---- a/includes/stg/MiscClosures.h
-+++ b/includes/stg/MiscClosures.h
-@@ -390,8 +390,12 @@ RTS_FUN_DECL(stg_copySmallMutableArrayzh
- RTS_FUN_DECL(stg_casSmallArrayzh);
-
- RTS_FUN_DECL(stg_newMutVarzh);
-+#if __GLASGOW_HASKELL__ < 808
-+RTS_FUN_DECL(stg_atomicModifyMutVarzh);
-+#else
- RTS_FUN_DECL(stg_atomicModifyMutVar2zh);
- RTS_FUN_DECL(stg_atomicModifyMutVarzuzh);
-+#endif
- RTS_FUN_DECL(stg_casMutVarzh);
-
- RTS_FUN_DECL(stg_isEmptyMVarzh);
=====================================
p/ghc/debian/patches/fix-llvm-armel
=====================================
@@ -0,0 +1,28 @@
+Description: Fix LLVM error on armel
+ GHC 8.10 fails to build on armel with the following error:
+
+ LLVM ERROR: unable to allocate function argument #8
+ PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace.
+ Stack dump:
+ 0. Program arguments: llc-12 -O2 -enable-tbaa -relocation-model=pic -mcpu=arm7tdmi -mattr=+soft-float,-vfp2,-vfp2sp,-vfp3,-vfp3d16,-vfp3d16sp,-vfp3sp,-fp16,-vfp4,-vfp4d16,-vfp4d16sp,-vfp4sp,-fp-armv8,-fp-armv8d16,-fp-armv8d16sp,-fp-armv8sp,-fullfp16,-fp64,-d32,-neon,-crypto,-dotprod,-fp16fml,-bf16,-mve,-mve.fp,-fpregs,+strict-align /tmp/ghc5537_0/ghc_6.bc -o /tmp/ghc5537_0/ghc_7.lm_s
+ 1. Running pass 'Function Pass Manager' on module '/tmp/ghc20177_0/ghc_6.bc'.
+ 2. Running pass 'ARM Instruction Selection' on function '@"stg_gc_f1$def"'
+ `llc-12' failed in phase `LLVM Compiler'. (Exit code: -6)
+ make[3]: *** [rts/ghc.mk:325: rts/dist/build/HeapStackCheck.o] Error 1
+
+ Surprisingly, reverting commit 4540bbe2811e860f35de6e67ab2f0040592fd3a5 fixes
+ thie error.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20285
+Index: b/includes/CodeGen.Platform.hs
+===================================================================
+--- a/includes/CodeGen.Platform.hs
++++ b/includes/CodeGen.Platform.hs
+@@ -6,6 +6,7 @@ import GHC.Utils.Panic.Plain
+ #endif
+ import GHC.Platform.Reg
+
++#include "ghcautoconf.h"
+ #include "stg/MachRegs.h"
+
+ #if defined(MACHREGS_i386) || defined(MACHREGS_x86_64)
=====================================
p/ghc/debian/patches/ghc-warnings.mk-CC-Wall.patch
=====================================
@@ -0,0 +1,12 @@
+--- ghc-8.4.3/mk/warnings.mk~ 2018-02-04 02:30:11.000000000 +0900
++++ ghc-8.4.3/mk/warnings.mk 2018-09-29 14:33:37.607884921 +0900
+@@ -1,6 +1,6 @@
+ # See Note [Order of warning flags].
+-SRC_CC_OPTS += -Wall $(WERROR)
++#SRC_CC_OPTS += -Wall $(WERROR)
+ SRC_HC_OPTS += -Wall
+ # Don't add -Werror to SRC_HC_OPTS_STAGE0 (or SRC_HC_OPTS), because otherwise
+ # validate may unnecessarily fail when booting with an older compiler.
+ # It would be better to only exclude certain warnings from becoming errors
+
+Diff finished. Sat Sep 29 14:35:43 2018
=====================================
p/ghc/debian/patches/haddock-remove-googleapis-fonts
=====================================
@@ -6,14 +6,16 @@ Index: b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
===================================================================
--- a/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
+++ b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
-@@ -127,13 +127,13 @@ headHtml docTitle themes mathjax_url =
- , thetitle << docTitle
- , styleSheet themes
- , thelink ! [ rel "stylesheet", thetype "text/css", href quickJumpCssFile] << noHtml
+@@ -137,7 +137,7 @@ headHtml docTitle themes mathjax_url bas
+ , thetype "text/css"
+ , href (withBaseURL base_url quickJumpCssFile) ]
+ << noHtml
- , thelink ! [ rel "stylesheet", thetype "text/css", href fontUrl] << noHtml
+ -- , thelink ! [ rel "stylesheet", thetype "text/css", href fontUrl] << noHtml
- , script ! [src haddockJsFile, emptyAttr "async", thetype "text/javascript"] << noHtml
- , script ! [thetype "text/x-mathjax-config"] << primHtml mjConf
+ , script ! [ src (withBaseURL base_url haddockJsFile)
+ , emptyAttr "async"
+ , thetype "text/javascript" ]
+@@ -146,7 +146,7 @@ headHtml docTitle themes mathjax_url bas
, script ! [src mjUrl, thetype "text/javascript"] << noHtml
]
where
=====================================
p/ghc/debian/patches/kfreebsd-aclocal.m4
=====================================
@@ -2,20 +2,20 @@ 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: b/aclocal.m4
+Index: b/m4/fptools.m4
===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -2048,7 +2048,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
+--- a/m4/fptools.m4
++++ b/m4/fptools.m4
+@@ -2144,7 +2144,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
$3="openbsd"
;;
# As far as I'm aware, none of these have relevant variants
-- freebsd|netbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
-+ freebsd|netbsd|dragonfly|hpux|linuxaout|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
+- freebsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
++ freebsd|dragonfly|hpux|linuxaout|freebsd2|mingw32|darwin|nextstep2|nextstep3|sunos4|ultrix|haiku)
$3="$1"
;;
msys)
-@@ -2068,6 +2068,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
+@@ -2164,6 +2164,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
# i686-gentoo-freebsd8.2
$3="freebsd"
;;
=====================================
p/ghc/debian/patches/latomic-64bit
=====================================
@@ -0,0 +1,82 @@
+Description: Use libatomic for 64-bit operations
+ The rts package uses GCC's __atomic built-in functions on 64-bit values. This
+ is not supported on some 32bit platforms (e.g., mipsel) resulting in the
+ following compilation error:
+
+ rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_load_8'
+ rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_store_8'
+ rts/dist/build/libHSrts_thr-ghc8.10.7.so: error: undefined reference to '__atomic_fetch_add_8'
+
+ Fix this by linking against libatomic.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20549
+Forwarded: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6820
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1286,12 +1286,11 @@ AC_LINK_IFELSE([
+ AC_MSG_RESULT(no)
+ )
+
++need_latomic=0
+ AC_MSG_CHECKING(whether -latomic is needed for sub-word-sized atomic operations)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
+ [
+ AC_MSG_RESULT(no)
+- AC_SUBST([CabalNeedLibatomic],[False])
+- need_latomic=0
+ ],
+ [
+ _save_LIBS=$LIBS
+@@ -1299,18 +1298,46 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsign
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
+ [
+ AC_MSG_RESULT(yes)
+- AC_SUBST([CabalNeedLibatomic],[True])
+ need_latomic=1
+ ],
+ [
+- AC_SUBST([CabalNeedLibatomic],[False])
+ AC_MSG_ERROR([sub-word-sized atomic operations not available.])
+- need_latomic=0
+ ])
+ LIBS=$_save_LIBS
+ ])
++AC_MSG_CHECKING(whether -latomic is needed for 64-bit atomic operations)
++AC_LINK_IFELSE([AC_LANG_PROGRAM(
++ [[
++ #include <inttypes.h>
++ uint64_t a;
++ ]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
++ [
++ AC_MSG_RESULT(no)
++ ],
++ [
++ _save_LIBS=$LIBS
++ LIBS="-latomic"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM(
++ [[
++ #include <inttypes.h>
++ uint64_t a;
++ ]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
++ [
++ AC_MSG_RESULT(yes)
++ need_latomic=1
++ ],
++ [
++ AC_MSG_ERROR([64-bit atomic operations not available.])
++ ])
++ LIBS=$_save_LIBS
++ ])
++if test $need_latomic = 1; then
++ AC_SUBST([CabalNeedLibatomic],[True])
++else
++ AC_SUBST([CabalNeedLibatomic],[False])
++fi
+ AC_DEFINE_UNQUOTED([NEED_ATOMIC_LIB], [$need_latomic],
+- [Define to 1 if we need -latomic for sub-word atomic operations.])
++ [Define to 1 if we need -latomic.])
+
+ dnl ** check for eventfd which is needed by the I/O manager
+ AC_CHECK_HEADERS([sys/eventfd.h])
=====================================
p/ghc/debian/patches/latomic-subword
=====================================
@@ -0,0 +1,85 @@
+commit 90f06a0e015e18c066fe1569fb2add318bec72ca
+Author: Haochen Tong <i at hexchain.org>
+Date: Mon Oct 11 11:40:56 2021 +0800
+
+ Check for libatomic dependency for atomic operations
+
+ Some platforms (e.g. RISC-V) require linking against libatomic for some
+ (e.g. sub-word-sized) atomic operations.
+
+ Fixes #19119.
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1286,6 +1286,32 @@ AC_LINK_IFELSE([
+ AC_MSG_RESULT(no)
+ )
+
++AC_MSG_CHECKING(whether -latomic is needed for sub-word-sized atomic operations)
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
++ [
++ AC_MSG_RESULT(no)
++ AC_SUBST([CabalNeedLibatomic],[False])
++ need_latomic=0
++ ],
++ [
++ _save_LIBS=$LIBS
++ LIBS="-latomic"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[unsigned char a;]], [[__atomic_fetch_or(&a, 1, __ATOMIC_RELAXED);]])],
++ [
++ AC_MSG_RESULT(yes)
++ AC_SUBST([CabalNeedLibatomic],[True])
++ need_latomic=1
++ ],
++ [
++ AC_SUBST([CabalNeedLibatomic],[False])
++ AC_MSG_ERROR([sub-word-sized atomic operations not available.])
++ need_latomic=0
++ ])
++ LIBS=$_save_LIBS
++ ])
++AC_DEFINE_UNQUOTED([NEED_ATOMIC_LIB], [$need_latomic],
++ [Define to 1 if we need -latomic for sub-word atomic operations.])
++
+ dnl ** check for eventfd which is needed by the I/O manager
+ AC_CHECK_HEADERS([sys/eventfd.h])
+ AC_CHECK_FUNCS([eventfd])
+Index: b/rts/package.conf.in
+===================================================================
+--- a/rts/package.conf.in
++++ b/rts/package.conf.in
+@@ -63,6 +63,9 @@ extra-libraries:
+ , "elf"
+ , "dw" /* for backtraces */
+ #endif
++#if NEED_ATOMIC_LIB
++ , "atomic"
++#endif
+
+ #if defined(INSTALLING)
+ include-dirs: INCLUDE_DIR FFI_INCLUDE_DIR
+Index: b/rts/rts.cabal.in
+===================================================================
+--- a/rts/rts.cabal.in
++++ b/rts/rts.cabal.in
+@@ -20,6 +20,8 @@ flag libbfd
+ default: @CabalHaveLibbfd@
+ flag mingwex
+ default: @CabalMingwex@
++flag need-atomic
++ default: @CabalNeedLibatomic@
+ flag libdw
+ default: @CabalHaveLibdw@
+ flag libnuma
+@@ -126,6 +128,9 @@ library
+ if flag(need-pthread)
+ -- for pthread_getthreadid_np, pthread_create, ...
+ extra-libraries: pthread
++ if flag(need-atomic)
++ -- for sub-word-sized atomic operations (#19119)
++ extra-libraries: atomic
+ if flag(libbfd)
+ -- for debugging
+ extra-libraries: bfd iberty
=====================================
p/ghc/debian/patches/llvm-11.patch deleted
=====================================
@@ -1,67 +0,0 @@
-Description: Use LLVM 9
- Backport commits 8c5cb80698 and 8e5851f070 to use LLVM 9.
-
-Index: b/llvm-targets
-===================================================================
---- a/llvm-targets
-+++ b/llvm-targets
-@@ -1,24 +1,24 @@
- [("i386-unknown-windows", ("e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))
- ,("i686-unknown-windows", ("e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))
- ,("x86_64-unknown-windows", ("e-m:w-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
--,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
--,("armv6-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))
--,("armv6l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
--,("armv7-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
--,("armv7a-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
--,("armv7a-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
--,("armv7l-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
--,("armv7l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
-+,("armv6-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))
-+,("armv6l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
-+,("armv7-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("armv7a-unknown-linux-gnueabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("armv7a-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("armv7l-unknown-linux-gnueabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("armv7l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
- ,("aarch64-unknown-linux-gnu", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
- ,("aarch64-unknown-linux", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
- ,("i386-unknown-linux-gnu", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
- ,("i386-unknown-linux", ("e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", "pentium4", ""))
- ,("x86_64-unknown-linux-gnu", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
- ,("x86_64-unknown-linux", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
--,("x86_64-unknown-linux-android", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "+sse4.2 +popcnt"))
--,("armv7-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("x86_64-unknown-linux-android", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", "+sse4.2 +popcnt +cx16"))
-+,("armv7-unknown-linux-androideabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+fpregs +vfp2 +vfp2d16 +vfp2d16sp +vfp2sp +vfp3 +vfp3d16 +vfp3d16sp +vfp3sp -fp16 -vfp4 -vfp4d16 -vfp4d16sp -vfp4sp -fp-armv8 -fp-armv8d16 -fp-armv8d16sp -fp-armv8sp -fullfp16 +fp64 +d32 +neon -crypto -fp16fml"))
- ,("aarch64-unknown-linux-android", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
--,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
-+,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+fpregs +vfp2 +vfp2d16 +vfp2d16sp +vfp2sp +vfp3 +vfp3d16 +vfp3d16sp +vfp3sp -fp16 -vfp4 -vfp4d16 -vfp4d16sp -vfp4sp -fp-armv8 -fp-armv8d16 -fp-armv8d16sp -fp-armv8sp -fullfp16 +fp64 +d32 +neon -crypto -fp16fml"))
- ,("powerpc64le-unknown-linux", ("e-m:e-i64:64-n32:64", "ppc64le", ""))
- ,("i386-apple-darwin", ("e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128", "yonah", ""))
- ,("x86_64-apple-darwin", ("e-m:o-i64:64-f80:128-n8:16:32:64-S128", "core2", ""))
-@@ -29,7 +29,7 @@
- ,("amd64-portbld-freebsd", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
- ,("x86_64-unknown-freebsd", ("e-m:e-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
- ,("aarch64-unknown-freebsd", ("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "generic", "+neon"))
--,("armv6-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
--,("armv7-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+strict-align"))
--,("arm-unknown-nto-qnx-eabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+strict-align"))
-+,("armv6-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
-+,("armv7-unknown-freebsd-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "generic", "+strict-align"))
-+,("arm-unknown-nto-qnx-eabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+strict-align"))
- ]
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -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.
--LlvmVersion=7
-+LlvmVersion=11
- AC_SUBST([LlvmVersion])
- sUPPORTED_LLVM_VERSION=$(echo \($LlvmVersion\) | sed 's/\./,/')
- AC_DEFINE_UNQUOTED([sUPPORTED_LLVM_VERSION], ${sUPPORTED_LLVM_VERSION}, [The supported LLVM version number])
=====================================
p/ghc/debian/patches/llvm-arm-unknown-linux-gnueabi.patch deleted
=====================================
@@ -1,18 +0,0 @@
-Description: llvm-targets: Add arm-unknown-linux-gnueabi
- Add arm-unknown-linux-gnueabi, which is used by Debian's ARM EABI port
- (armel), as an LLVM target.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2789
-
-Index: b/llvm-targets
-===================================================================
---- a/llvm-targets
-+++ b/llvm-targets
-@@ -1,6 +1,7 @@
- [("i386-unknown-windows", ("e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))
- ,("i686-unknown-windows", ("e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))
- ,("x86_64-unknown-windows", ("e-m:w-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
-+,("arm-unknown-linux-gnueabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+soft-float -fp16 -vfp2 -vfp2sp -vfp2d16 -vfp2d16sp -vfp3 -vfp3sp -vfp3d16 -vfp3d16sp -vfp4 -vfp4sp -vfp4d16 -vfp4d16sp -fp-armv8 -fp-armv8sp -fp-armv8d16 -fp-armv8d16sp -fullfp16 -neon -crypto -dotprod -fp16fml -fp64 -d32 -fpregs +strict-align"))
- ,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
- ,("armv6-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))
- ,("armv6l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
=====================================
p/ghc/debian/patches/local-mathjax
=====================================
@@ -2,7 +2,7 @@ Index: b/docs/users_guide/conf.py
===================================================================
--- a/docs/users_guide/conf.py
+++ b/docs/users_guide/conf.py
-@@ -58,7 +58,7 @@ html_use_opensearch = 'https://downloads
+@@ -74,7 +74,7 @@ html_use_opensearch = 'https://downloads
html_show_copyright = True
# See GHC #15006
=====================================
p/ghc/debian/patches/newer-autoconf deleted
=====================================
@@ -1,18 +0,0 @@
-Description: Fix build with newer autoconf (2.71)
-Author: Matthias Klose <doko at debian.org>
-Bug-Debian: https://bugs.debian.org/995036
-Applied-Upstream: https://gitlab.haskell.org/ghc/ghc/-/commit/ad2ef3a13f1eb000eab8e3d64592373b91a52806
-
-Index: b/aclocal.m4
-===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -613,7 +613,7 @@ AC_DEFUN([FP_SET_CFLAGS_C99],
- CPPFLAGS="$$3"
- unset ac_cv_prog_cc_c99
- dnl perform detection
-- _AC_PROG_CC_C99
-+ AC_PROG_CC_C99
- fp_cc_c99="$ac_cv_prog_cc_c99"
- case "x$ac_cv_prog_cc_c99" in
- x) ;; # noop
=====================================
p/ghc/debian/patches/newer-sphinx deleted
=====================================
@@ -1,25 +0,0 @@
-Description: Fix build with newer Sphinx
- This is a partial cherry-pick of 83407ffc7acc00cc025b9f6ed063add9ab9f9bcc.
-Origin: https://gitlab.haskell.org/ghc/ghc/-/commit/83407ffc7acc00cc025b9f6ed063add9ab9f9bcc
-Bug-Debian: https://bugs.debian.org/995429
-
-Index: b/docs/users_guide/conf.py
-===================================================================
---- a/docs/users_guide/conf.py
-+++ b/docs/users_guide/conf.py
-@@ -77,13 +77,13 @@ htmlhelp_basename = 'GHCUsersGuide'
- latex_elements = {
- 'inputenc': '',
- 'utf8extra': '',
-- 'preamble': '''
-+ 'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
- \setsansfont{DejaVu Sans}
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
-
=====================================
p/ghc/debian/patches/no-missing-haddock-file-warning
=====================================
@@ -7,7 +7,7 @@ Index: b/utils/ghc-pkg/Main.hs
===================================================================
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
-@@ -1889,8 +1889,10 @@ checkPackageConfig pkg verbosity db_stac
+@@ -1875,8 +1875,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
=====================================
@@ -6,13 +6,7 @@ x32-use-native-x86_64-insn.patch
use-stage1-binaries-for-install.patch
kfreebsd-aclocal.m4
local-mathjax
-fix-build-using-unregisterised-v8.6
-llvm-11.patch
-llvm-arm-unknown-linux-gnueabi.patch
-fix-32bit-atomic
-3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
-11f8eef5a9625c77f78a829406c446b615ed6168.patch
haddock-remove-googleapis-fonts
-fix-big-endian-ffi
-newer-autoconf
-newer-sphinx
+fix-llvm-armel
+latomic-subword
+latomic-64bit
=====================================
p/ghc/debian/patches/use-debian-gen_contents_index
=====================================
@@ -2,7 +2,7 @@ Index: b/ghc.mk
===================================================================
--- a/ghc.mk
+++ b/ghc.mk
-@@ -811,7 +811,6 @@ endif
+@@ -801,7 +801,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: b/ghc.mk
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
-@@ -944,12 +943,8 @@ endif
+@@ -933,12 +932,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: b/ghc.mk
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -1070,7 +1065,6 @@ $(eval $(call bindist-list,.,\
+@@ -1061,7 +1056,6 @@ $(eval $(call bindist-list,.,\
mk/project.mk \
mk/install.mk.in \
bindist.mk \
=====================================
p/ghc/debian/patches/use-stage1-binaries-for-install.patch
=====================================
@@ -11,7 +11,7 @@ Index: b/ghc.mk
===================================================================
--- a/ghc.mk
+++ b/ghc.mk
-@@ -963,8 +963,12 @@ else # CrossCompiling
+@@ -952,8 +952,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
=====================================
@@ -16,7 +16,7 @@ Index: b/rts/RtsSymbols.c
===================================================================
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
-@@ -938,7 +938,7 @@
+@@ -1010,7 +1010,7 @@ extern char **environ;
// 64-bit support functions in libgcc.a
=====================================
p/ghc/debian/rules
=====================================
@@ -39,7 +39,11 @@ export GHC=$(firstword $(shell bash -c "type -p ghc"))
DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
-ifneq (,$(filter powerpcspe x32, $(DEB_HOST_ARCH)))
+ifneq (,$(filter i386 powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
+ # From GHC 8.10 and later, native code generator support for legacy x87
+ # floating point coprocessor has been removed. GHC now only support floating
+ # point via SSE2. This causes a baseline violation on Debian for i386 where
+ # there is no SSE support. Fallback to unregisterised builds on i386.
EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
endif
@@ -71,10 +75,14 @@ override_dh_autoreconf:
override_dh_auto_configure:
echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
ifeq (NO,$(BUILD_CROSS))
+ echo "CrossCompiling := NO" >> mk/build.mk
+ echo "Stage1Only := NO" >> mk/build.mk
echo "HADDOCK_DOCS := YES" >> mk/build.mk
echo "EXTRA_HADDOCK_OPTS += --mathjax=file:///usr/share/javascript/mathjax/MathJax.js" >> mk/build.mk
echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
else
+ echo "CrossCompiling := YES" >> mk/build.mk
+ echo "Stage1Only := NO" >> mk/build.mk
echo "SRC_HC_OPTS += -O0 -H64m" >> mk/build.mk
echo "GhcStage1HcOpts = -O" >> mk/build.mk
echo "GhcStage2HcOpts = -O0" >> mk/build.mk
@@ -91,12 +99,16 @@ ifeq (big, $(DEB_TARGET_ARCH_ENDIAN))
# See https://gitlab.haskell.org/ghc/ghc/issues/16998
patch -p1 < debian/patches/Disable-unboxed-arrays.patch
endif
-ifneq (,$(filter mips mipsel s390x, $(DEB_HOST_ARCH)))
+ifneq (,$(filter powerpcspe x32 s390x, $(DEB_HOST_ARCH)))
+ # From Fedora
+ patch -p1 < debian/patches/ghc-warnings.mk-CC-Wall.patch
+endif
+ifneq (,$(filter i386 mips mipsel s390x, $(DEB_HOST_ARCH)))
echo "SRC_HC_OPTS += -optc--param -optcggc-min-expand=10" >> mk/build.mk
endif
ifneq (,$(filter mips64el, $(DEB_HOST_ARCH)))
# Pass -mxgot to fix relocation linker errors
- echo "compiler/hsSyn/HsInstances_HC_OPTS += -optc-mxgot" >> mk/build.mk
+ echo "compiler/GHC/Hs/Instances_HC_OPTS += -optc-mxgot" >> mk/build.mk
endif
ifeq (x32,$(DEB_HOST_ARCH))
echo "INTEGER_LIBRARY = integer-simple" >> mk/build.mk
@@ -117,12 +129,12 @@ ifneq (,$(filter noopt, $(DEB_BUILD_OPTIONS)))
# echo "GhcLibHcOpts += -O0" >> mk/build.mk
echo "GhcRtsCcOpts += -O0" >> mk/build.mk
endif
-ifneq (,$(filter alpha m68k mipsel hppa sh4 x32, $(DEB_HOST_ARCH)))
+ifneq (,$(filter alpha i386 m68k mipsel hppa sh4 x32, $(DEB_HOST_ARCH)))
# Virtual memory exhausted when trying to build unregisterised compiler on
- # 32-bit targets. Disable optimizations for compiler/hsSyn/HsInstances.hs.
+ # 32-bit targets. Disable optimizations for compiler/GHC/Hs/Instances.hs.
# See https://bugs.debian.org/933968
# See https://gitlab.haskell.org/ghc/ghc/issues/17048
- echo "compiler/hsSyn/HsInstances_HC_OPTS += -O0" >> mk/build.mk
+ echo "compiler/GHC/Hs/Instances_HC_OPTS += -O0" >> mk/build.mk
endif
# We also want to build the threaded profiling-enabled debug runtime,
# because it does no harm
=====================================
p/ghc/debian/upstream/signing-key.asc
=====================================
@@ -50,3 +50,46 @@ yWD+zlhDE+M4ob0lVXjn3dFxaKf+WkR0DjMJPo/iElLI4aist71QKDKdTP+EOErW
fnXw
=rxVr
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: 88B5 7FCF 7DB5 3B4D B3BF A4B1 5887 64FB E22D 19C4
+Comment: Zubin Duggal (GHC signing key) <zubin at well-typed.com>
+
+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
+=BYYp
+-----END PGP PUBLIC KEY BLOCK-----
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/b06c969ed5f342fc96d726ec43e3c60a0d554e16...d0b7b8ad5fdeda3e48d2c2d37ce00614f6a2ead5
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/b06c969ed5f342fc96d726ec43e3c60a0d554e16...d0b7b8ad5fdeda3e48d2c2d37ce00614f6a2ead5
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/20220610/c8b49088/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list