Ilias Tsitsimpis [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Merge ghc (9.0.2-2) import into refs/heads/workingbranch
Ben Gamari [Fri, 29 Apr 2022 16:51:26 +0000 (12:51 -0400)]
[PATCH] Update supported LLVM versions
Pull forward minimum version to match 9.2.
(cherry picked from commit
c26faa54c5fbe902ccb74e79d87e3fa705e270d1)
Gbp-Pq: Name
ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch
Cheng Shao [Thu, 27 Jan 2022 12:12:14 +0000 (12:12 +0000)]
[PATCH] configure: bump LlvmMaxVersion to 14
LLVM 13.0.0 is released in Oct 2021, and latest head validates against
LLVM 13 just fine if LlvmMaxVersion is bumped.
Gbp-Pq: Name
78db231ffdf8385662812781c1d09c630cfad313.patch
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
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@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20549
Forwarded: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6820
Gbp-Pq: Name latomic-64bit
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
latomic-subword
commit
90f06a0e015e18c066fe1569fb2add318bec72ca
Author: Haochen Tong <i@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.
Gbp-Pq: Name latomic-subword
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
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@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/20285
Gbp-Pq: Name fix-llvm-armel
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Remove hard-coded googleapis font URL
Bug: https://github.com/haskell/haddock/issues/1211
Bug-Debian: https://bugs.debian.org/963690
Gbp-Pq: Name haddock-remove-googleapis-fonts
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
local-mathjax
===================================================================
Gbp-Pq: Name local-mathjax
Svante Signell [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Bug-Debian: https://bugs.debian.org/913140
Gbp-Pq: Name kfreebsd-aclocal.m4
John Paul Adrian Glaubitz [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Use the stage1 binaries for install
Last-Update: 2017-01-29
In order to be able to perform a cross-build, we need to use
the stage1 binaries during installation. Both ghc and ghc-pkg
are run during the install target and therefore must be able
to run on the build machine.
Gbp-Pq: Name use-stage1-binaries-for-install.patch
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Use native x86_64 instructions on x32
This patch enables a few native 64-bit integer instructions
on x32 which are available on this architecture despite using
32-bit pointers. These instructions are present on x86_64 but
not on x86 and ghc checks the size of (void *) to determine
that. This method fails on x32 since despite using 32-bit
pointers and hence sizeof(void *) == 4, it still uses the
full x86_64 instruction set and software-emulated variants
of the aforementioned 64-bit integer instructions are
therefore not present in the toolchain which will make ghc
fail to build on x32.
See: https://ghc.haskell.org/trac/ghc/ticket/11571
Gbp-Pq: Name x32-use-native-x86_64-insn.patch
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
buildpath-abi-stability
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Gbp-Pq: Name buildpath-abi-stability.patch
Joachim Breitner [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Do not emit a warning if the .haddock file is missing
As it is quite common on Debian installations to install the -dev package
without the -doc package.
Gbp-Pq: Name no-missing-haddock-file-warning
Jani Monoses [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Use VFPv3-D16 FPU for ARM builds
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Jani writes: The D16 part was Debian/Ubuntu specific, IIRC we define hardfloat
in that particular variant (16 double registers) or we had a different naming
for some reason.
Gbp-Pq: Name ARM-VFPv3D16
Debian Haskell Group [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Ilias Tsitsimpis [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
ghc (9.0.2-2) unstable; urgency=medium
* Upload to unstable.
[dgit import unpatched ghc 9.0.2-2]
Ilias Tsitsimpis [Tue, 21 Jun 2022 16:57:57 +0000 (17:57 +0100)]
Import ghc_9.0.2-2.debian.tar.xz
[dgit import tarball ghc 9.0.2-2 ghc_9.0.2-2.debian.tar.xz]
Ilias Tsitsimpis [Fri, 3 Jun 2022 08:25:00 +0000 (09:25 +0100)]
Import ghc_9.0.2.orig.tar.xz
[dgit import orig ghc_9.0.2.orig.tar.xz]
Ilias Tsitsimpis [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Merge ghc (8.8.4-3) import into refs/heads/workingbranch
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Fix build with newer Sphinx
Origin: https://gitlab.haskell.org/ghc/ghc/-/commit/
83407ffc7acc00cc025b9f6ed063add9ab9f9bcc
Bug-Debian: https://bugs.debian.org/995429
This is a partial cherry-pick of
83407ffc7acc00cc025b9f6ed063add9ab9f9bcc.
Gbp-Pq: Name newer-sphinx
Matthias Klose [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Fix build with newer autoconf (2.71)
Bug-Debian: https://bugs.debian.org/995036
Applied-Upstream: https://gitlab.haskell.org/ghc/ghc/-/commit/
ad2ef3a13f1eb000eab8e3d64592373b91a52806
Gbp-Pq: Name newer-autoconf
Peter Trommler [Thu, 11 Jun 2020 06:31:22 +0000 (08:31 +0200)]
[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
Gbp-Pq: Name fix-big-endian-ffi
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Remove hard-coded googleapis font URL
Bug: https://github.com/haskell/haddock/issues/1211
Bug-Debian: https://bugs.debian.org/963690
Gbp-Pq: Name haddock-remove-googleapis-fonts
Stefan Schulze Frielinghaus [Wed, 11 Dec 2019 06:47:16 +0000 (07:47 +0100)]
[PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
Gbp-Pq: Name
11f8eef5a9625c77f78a829406c446b615ed6168.patch
Stefan Schulze Frielinghaus [Mon, 9 Dec 2019 14:41:57 +0000 (15:41 +0100)]
[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).
Gbp-Pq: Name
3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
Ilias Tsitsimpis [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Do not define hs_atomic{read,write}64() on non-64bit
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17886
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2804
Gbp-Pq: Name fix-32bit-atomic
Ilias Tsitsimpis [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
llvm-targets: Add arm-unknown-linux-gnueabi
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2789
Add arm-unknown-linux-gnueabi, which is used by Debian's ARM EABI port
(armel), as an LLVM target.
Gbp-Pq: Name llvm-arm-unknown-linux-gnueabi.patch
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Use LLVM 9
Backport commits
8c5cb80698 and
8e5851f070 to use LLVM 9.
Gbp-Pq: Name llvm-11.patch
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
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@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111
Gbp-Pq: Name fix-build-using-unregisterised-v8.6
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
local-mathjax
===================================================================
Gbp-Pq: Name local-mathjax
Svante Signell [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Bug-Debian: https://bugs.debian.org/913140
Gbp-Pq: Name kfreebsd-aclocal.m4
John Paul Adrian Glaubitz [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Use the stage1 binaries for install
Last-Update: 2017-01-29
In order to be able to perform a cross-build, we need to use
the stage1 binaries during installation. Both ghc and ghc-pkg
are run during the install target and therefore must be able
to run on the build machine.
Gbp-Pq: Name use-stage1-binaries-for-install.patch
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Use native x86_64 instructions on x32
This patch enables a few native 64-bit integer instructions
on x32 which are available on this architecture despite using
32-bit pointers. These instructions are present on x86_64 but
not on x86 and ghc checks the size of (void *) to determine
that. This method fails on x32 since despite using 32-bit
pointers and hence sizeof(void *) == 4, it still uses the
full x86_64 instruction set and software-emulated variants
of the aforementioned 64-bit integer instructions are
therefore not present in the toolchain which will make ghc
fail to build on x32.
See: https://ghc.haskell.org/trac/ghc/ticket/11571
Gbp-Pq: Name x32-use-native-x86_64-insn.patch
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
buildpath-abi-stability
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Gbp-Pq: Name buildpath-abi-stability.patch
Joachim Breitner [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Do not emit a warning if the .haddock file is missing
As it is quite common on Debian installations to install the -dev package
without the -doc package.
Gbp-Pq: Name no-missing-haddock-file-warning
Jani Monoses [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Use VFPv3-D16 FPU for ARM builds
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Jani writes: The D16 part was Debian/Ubuntu specific, IIRC we define hardfloat
in that particular variant (16 double registers) or we had a different naming
for some reason.
Gbp-Pq: Name ARM-VFPv3D16
Debian Haskell Group [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Ilias Tsitsimpis [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
ghc (8.8.4-3) unstable; urgency=medium
* Disable parallel install to fix races with missing directories
(Closes: #944493)
* Fix FTBFS with autoconf 2.71. Thanks to Matthias Klose for the patch
(Closes: #995036)
* Fix FTBFS with Sphinx 4.2.0 (Closes: #995429)
[dgit import unpatched ghc 8.8.4-3]
Ilias Tsitsimpis [Sun, 3 Oct 2021 11:27:00 +0000 (12:27 +0100)]
Import ghc_8.8.4-3.debian.tar.xz
[dgit import tarball ghc 8.8.4-3 ghc_8.8.4-3.debian.tar.xz]
Gianfranco Costamagna [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Merge ghc (8.8.4-2) import into refs/heads/workingbranch
Peter Trommler [Thu, 11 Jun 2020 06:31:22 +0000 (08:31 +0200)]
[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
Gbp-Pq: Name fix-big-endian-ffi
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Remove hard-coded googleapis font URL
Bug: https://github.com/haskell/haddock/issues/1211
Bug-Debian: https://bugs.debian.org/963690
Gbp-Pq: Name haddock-remove-googleapis-fonts
Stefan Schulze Frielinghaus [Wed, 11 Dec 2019 06:47:16 +0000 (07:47 +0100)]
[PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
Gbp-Pq: Name
11f8eef5a9625c77f78a829406c446b615ed6168.patch
Stefan Schulze Frielinghaus [Mon, 9 Dec 2019 14:41:57 +0000 (15:41 +0100)]
[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).
Gbp-Pq: Name
3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
Ilias Tsitsimpis [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Do not define hs_atomic{read,write}64() on non-64bit
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17886
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2804
Gbp-Pq: Name fix-32bit-atomic
Ilias Tsitsimpis [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
llvm-targets: Add arm-unknown-linux-gnueabi
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2789
Add arm-unknown-linux-gnueabi, which is used by Debian's ARM EABI port
(armel), as an LLVM target.
Gbp-Pq: Name llvm-arm-unknown-linux-gnueabi.patch
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Use LLVM 9
Backport commits
8c5cb80698 and
8e5851f070 to use LLVM 9.
Gbp-Pq: Name llvm-11.patch
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
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@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111
Gbp-Pq: Name fix-build-using-unregisterised-v8.6
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
local-mathjax
===================================================================
Gbp-Pq: Name local-mathjax
Svante Signell [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Bug-Debian: https://bugs.debian.org/913140
Gbp-Pq: Name kfreebsd-aclocal.m4
John Paul Adrian Glaubitz [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Use the stage1 binaries for install
Last-Update: 2017-01-29
In order to be able to perform a cross-build, we need to use
the stage1 binaries during installation. Both ghc and ghc-pkg
are run during the install target and therefore must be able
to run on the build machine.
Gbp-Pq: Name use-stage1-binaries-for-install.patch
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Use native x86_64 instructions on x32
This patch enables a few native 64-bit integer instructions
on x32 which are available on this architecture despite using
32-bit pointers. These instructions are present on x86_64 but
not on x86 and ghc checks the size of (void *) to determine
that. This method fails on x32 since despite using 32-bit
pointers and hence sizeof(void *) == 4, it still uses the
full x86_64 instruction set and software-emulated variants
of the aforementioned 64-bit integer instructions are
therefore not present in the toolchain which will make ghc
fail to build on x32.
See: https://ghc.haskell.org/trac/ghc/ticket/11571
Gbp-Pq: Name x32-use-native-x86_64-insn.patch
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
buildpath-abi-stability
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Gbp-Pq: Name buildpath-abi-stability.patch
Joachim Breitner [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Do not emit a warning if the .haddock file is missing
As it is quite common on Debian installations to install the -dev package
without the -doc package.
Gbp-Pq: Name no-missing-haddock-file-warning
Jani Monoses [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Use VFPv3-D16 FPU for ARM builds
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Jani writes: The D16 part was Debian/Ubuntu specific, IIRC we define hardfloat
in that particular variant (16 double registers) or we had a different naming
for some reason.
Gbp-Pq: Name ARM-VFPv3D16
Debian Haskell Group [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Gianfranco Costamagna [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
ghc (8.8.4-2) unstable; urgency=medium
[ Ilias Tsitsimpis ]
* Correctly set 'haddock-interfaces' for base libraries (Closes: #968446)
* Remove files generated by postinst script (Closes: #909922)
* Add myself as an uploader
[ Gianfranco Costamagna ]
* Lower parallel builds to 2 on Ubuntu armhf, to speed up build process.
[ Adrian Bunk ]
* Update to llvm-11. (Closes: #974794)
[dgit import unpatched ghc 8.8.4-2]
Gianfranco Costamagna [Wed, 23 Dec 2020 22:15:42 +0000 (22:15 +0000)]
Import ghc_8.8.4-2.debian.tar.xz
[dgit import tarball ghc 8.8.4-2 ghc_8.8.4-2.debian.tar.xz]
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Import ghc_8.8.4.orig.tar.xz
[dgit import orig ghc_8.8.4.orig.tar.xz]
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Merge ghc (8.8.4-1) import into refs/heads/workingbranch
Peter Trommler [Thu, 11 Jun 2020 06:31:22 +0000 (08:31 +0200)]
[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
Gbp-Pq: Name fix-big-endian-ffi
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Remove hard-coded googleapis font URL
Bug: https://github.com/haskell/haddock/issues/1211
Bug-Debian: https://bugs.debian.org/963690
Gbp-Pq: Name haddock-remove-googleapis-fonts
Stefan Schulze Frielinghaus [Wed, 11 Dec 2019 06:47:16 +0000 (07:47 +0100)]
[PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
Gbp-Pq: Name
11f8eef5a9625c77f78a829406c446b615ed6168.patch
Stefan Schulze Frielinghaus [Mon, 9 Dec 2019 14:41:57 +0000 (15:41 +0100)]
[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).
Gbp-Pq: Name
3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Do not define hs_atomic{read,write}64() on non-64bit
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17886
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2804
Gbp-Pq: Name fix-32bit-atomic
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
llvm-targets: Add arm-unknown-linux-gnueabi
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2789
Add arm-unknown-linux-gnueabi, which is used by Debian's ARM EABI port
(armel), as an LLVM target.
Gbp-Pq: Name llvm-arm-unknown-linux-gnueabi.patch
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Use LLVM 9
Backport commits
8c5cb80698 and
8e5851f070 to use LLVM 9.
Gbp-Pq: Name llvm-9.patch
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
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@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111
Gbp-Pq: Name fix-build-using-unregisterised-v8.6
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
local-mathjax
===================================================================
Gbp-Pq: Name local-mathjax
Svante Signell [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Bug-Debian: https://bugs.debian.org/913140
Gbp-Pq: Name kfreebsd-aclocal.m4
John Paul Adrian Glaubitz [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Use the stage1 binaries for install
Last-Update: 2017-01-29
In order to be able to perform a cross-build, we need to use
the stage1 binaries during installation. Both ghc and ghc-pkg
are run during the install target and therefore must be able
to run on the build machine.
Gbp-Pq: Name use-stage1-binaries-for-install.patch
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Use native x86_64 instructions on x32
This patch enables a few native 64-bit integer instructions
on x32 which are available on this architecture despite using
32-bit pointers. These instructions are present on x86_64 but
not on x86 and ghc checks the size of (void *) to determine
that. This method fails on x32 since despite using 32-bit
pointers and hence sizeof(void *) == 4, it still uses the
full x86_64 instruction set and software-emulated variants
of the aforementioned 64-bit integer instructions are
therefore not present in the toolchain which will make ghc
fail to build on x32.
See: https://ghc.haskell.org/trac/ghc/ticket/11571
Gbp-Pq: Name x32-use-native-x86_64-insn.patch
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
buildpath-abi-stability
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Gbp-Pq: Name buildpath-abi-stability.patch
Joachim Breitner [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Do not emit a warning if the .haddock file is missing
As it is quite common on Debian installations to install the -dev package
without the -doc package.
Gbp-Pq: Name no-missing-haddock-file-warning
Jani Monoses [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Use VFPv3-D16 FPU for ARM builds
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Jani writes: The D16 part was Debian/Ubuntu specific, IIRC we define hardfloat
in that particular variant (16 double registers) or we had a different naming
for some reason.
Gbp-Pq: Name ARM-VFPv3D16
Debian Haskell Group [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
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
[dgit import unpatched ghc 8.8.4-1]
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Import ghc_8.8.4-1.debian.tar.xz
[dgit import tarball ghc 8.8.4-1 ghc_8.8.4-1.debian.tar.xz]
Gianfranco Costamagna [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Merge ghc (8.8.3-3) import into refs/heads/workingbranch
Stefan Schulze Frielinghaus [Wed, 11 Dec 2019 06:47:16 +0000 (07:47 +0100)]
[PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
Gbp-Pq: Name
11f8eef5a9625c77f78a829406c446b615ed6168.patch
Stefan Schulze Frielinghaus [Mon, 9 Dec 2019 14:41:57 +0000 (15:41 +0100)]
[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).
Gbp-Pq: Name
3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
Ilias Tsitsimpis [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Do not define hs_atomic{read,write}64() on non-64bit
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17886
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2804
Gbp-Pq: Name fix-32bit-atomic
Ilias Tsitsimpis [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
llvm-targets: Add arm-unknown-linux-gnueabi
Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2789
Add arm-unknown-linux-gnueabi, which is used by Debian's ARM EABI port
(armel), as an LLVM target.
Gbp-Pq: Name llvm-arm-unknown-linux-gnueabi.patch
Debian Haskell Group [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Use LLVM 9
Backport commits
8c5cb80698 and
8e5851f070 to use LLVM 9.
Gbp-Pq: Name llvm-9.patch
Debian Haskell Group [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
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@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111
Gbp-Pq: Name fix-build-using-unregisterised-v8.6
Debian Haskell Group [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
local-mathjax
Gbp-Pq: Name local-mathjax
Svante Signell [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Bug-Debian: https://bugs.debian.org/913140
Gbp-Pq: Name kfreebsd-aclocal.m4
John Paul Adrian Glaubitz [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Use the stage1 binaries for install
Last-Update: 2017-01-29
In order to be able to perform a cross-build, we need to use
the stage1 binaries during installation. Both ghc and ghc-pkg
are run during the install target and therefore must be able
to run on the build machine.
Gbp-Pq: Name use-stage1-binaries-for-install.patch
Debian Haskell Group [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Use native x86_64 instructions on x32
This patch enables a few native 64-bit integer instructions
on x32 which are available on this architecture despite using
32-bit pointers. These instructions are present on x86_64 but
not on x86 and ghc checks the size of (void *) to determine
that. This method fails on x32 since despite using 32-bit
pointers and hence sizeof(void *) == 4, it still uses the
full x86_64 instruction set and software-emulated variants
of the aforementioned 64-bit integer instructions are
therefore not present in the toolchain which will make ghc
fail to build on x32.
See: https://ghc.haskell.org/trac/ghc/ticket/11571
Gbp-Pq: Name x32-use-native-x86_64-insn.patch
Debian Haskell Group [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
buildpath-abi-stability
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Gbp-Pq: Name buildpath-abi-stability.patch
Joachim Breitner [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Do not emit a warning if the .haddock file is missing
As it is quite common on Debian installations to install the -dev package
without the -doc package.
Gbp-Pq: Name no-missing-haddock-file-warning
Jani Monoses [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Use VFPv3-D16 FPU for ARM builds
Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
Jani writes: The D16 part was Debian/Ubuntu specific, IIRC we define hardfloat
in that particular variant (16 double registers) or we had a different naming
for some reason.
Gbp-Pq: Name ARM-VFPv3D16
Debian Haskell Group [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Gianfranco Costamagna [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
ghc (8.8.3-3) unstable; urgency=medium
* Reupload due to bad debian/rules merge
[dgit import unpatched ghc 8.8.3-3]
Gianfranco Costamagna [Fri, 31 Jul 2020 15:48:26 +0000 (16:48 +0100)]
Import ghc_8.8.3-3.debian.tar.xz
[dgit import tarball ghc 8.8.3-3 ghc_8.8.3-3.debian.tar.xz]
Sandro Tosi [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
Merge ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-3) import into refs/heads/workingbranch
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
powerpc32: fix 64-bit comparison
On powerpc32 64-bit comparison code generated dangling
target labels. This caused ghc build failure as:
$ ./configure --target=powerpc-unknown-linux-gnu && make
...
SCCs aren't in reverse dependent order
bad blockId n3U
This happened because condIntCode' in PPC codegen generated
label name but did not place the label into `cmp_lo` code block.
The change adds the `cmp_lo` label into the case of negative
comparison.
Signed-off-by: 's avatarSergei Trofimovich <slyfox@gentoo.org>
.
Origin: https://gitlab.haskell.org/ghc/ghc/commit/
25dce3fc05e4788240ac6d192919063a9f548f7f
Last-Update: 2019-08-09
Gbp-Pq: Name powerpc-fix-64-bit-comparision.patch
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
PprC-Add-support-for-adjacent-floats
commit
35a897782b6b0a252da7fdcf4921198ad4e1d96c
Author: James Clarke <jrtc27@jrtc27.com>
Date: Thu Nov 22 11:55:17 2018 -0500
UNREG: PprC: Add support for adjacent floats
When two 32-bit floats are adjacent for a 64-bit target, there is no
padding between them to force alignment, so we must combine their bit
representations into a single word.
Reviewers: bgamari, simonmar
Reviewed By: simonmar
Subscribers: rwbarton, carter
GHC Trac Issues: #15853
Differential Revision: https://phabricator.haskell.org/D5306
Gbp-Pq: Name PprC-Add-support-for-adjacent-floats
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
cherry-pick of upstream commits
Last-Update: 2019-05-27
beba89a0f16681c85d39fc8a894bde4162ff492a.patch:
5e63a25249f3cb07300258e115af9ff55079d2ea.patch:
Gbp-Pq: Name risc-support.patch
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
Allow unregisterised ghc-8.4 to build newer GHC
Commit
4075656e8bb introduced a regression stopping existing unregisteristed
compilers from being able to compile newer versions of GHC. The problem is
that the bootstrap compiler uses the newer `rts/storage/ClosureTypes.h` file
where some defines have been renamed, resulting in the following error:
.
error: ‘stg_MUT_ARR_PTRS_FROZEN0_info’ undeclared (first use in this function); did you mean ‘stg_MUT_ARR_PTRS_FROZEN_DIRTY_info’?
.
For more information, see https://gitlab.haskell.org/ghc/ghc/issues/15913.
.
This patch can be removed, once ghc-8.4 is no longer the bootstrap compiler.
Author: Ilias Tsitsimpis <iliastsi@debian.org>
Bug: https://gitlab.haskell.org/ghc/ghc/issues/15913
Bug-Debian: https://bugs.debian.org/932941
Gbp-Pq: Name fix-build-using-unregisterized-v8.4