Raspbian automatic forward porter [Sun, 27 Dec 2020 19:30:12 +0000 (19:30 +0000)]
Merge version 8.8.4-1+rpi1 and 8.8.4-2 to produce 8.8.4-2+rpi1
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]
Raspbian automatic forward porter [Sat, 17 Oct 2020 14:42:06 +0000 (15:42 +0100)]
Merge version 8.8.3-3+rpi1 and 8.8.4-1 to produce 8.8.4-1+rpi1
Raspbian automatic forward porter [Wed, 12 Aug 2020 23:11:38 +0000 (00:11 +0100)]
Merge version 8.8.1+dfsg1+is+8.6.5+dfsg1-3+rpi1 and 8.8.3-3 to produce 8.8.3-3+rpi1
Ilias Tsitsimpis [Tue, 11 Aug 2020 14:12:43 +0000 (15:12 +0100)]
Merge ghc (8.8.4-1) import into refs/heads/workingbranch
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]
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]
Raspbian automatic forward porter [Fri, 27 Mar 2020 16:35:29 +0000 (16:35 +0000)]
Merge version 8.8.1+dfsg1+is+8.6.5+dfsg1-2+rpi1 and 8.8.1+dfsg1+is+8.6.5+dfsg1-3 to produce 8.8.1+dfsg1+is+8.6.5+dfsg1-3+rpi1
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
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
local-mathjax
Gbp-Pq: Name local-mathjax
Svante Signell [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Bug-Debian: https://bugs.debian.org/913140
Gbp-Pq: Name kfreebsd-aclocal.m4
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
add_-latomic_to_ghc-prim
commit
ce3897ffd6e7c8b8f36b8e920168bac8c7f836ae
Author: Ilias Tsitsimpis <iliastsi@debian.org>
Date: Tue Sep 18 17:45:17 2018 +0200
Fix check whether GCC supports __atomic_ builtins
Summary:
C11 atomics are never used because:
* The program used for checking whether GCC supports
__atomic_ builtins fails with the following error:
```
error: size mismatch in argument 2 of `__atomic_load`
int test(int *x) { int y; __atomic_load(&x, &y, __ATOMIC_SEQ_CST); return x; }
```
* There is a typo when checking if CONF_GCC_SUPPORTS__ATOMICS equals YES,
resulting in PRIM_CFLAGS and PRIM_EXTRA_LIBRARIES never being set.
Reviewers: bgamari
Reviewed By: bgamari
Subscribers: rwbarton, erikd, carter
Differential Revision: https://phabricator.haskell.org/D5154
Gbp-Pq: Name add_-latomic_to_ghc-prim
Sergei Trofimovich [Wed, 18 Jul 2018 21:36:58 +0000 (22:36 +0100)]
fix osReserveHeapMemory block alignment
X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/
e175aaf6918bb2b497b83618dc4c270a0d231a1c
fix osReserveHeapMemory block alignment
Before the change osReserveHeapMemory() attempted
to allocate chunks of memory via osTryReserveHeapMemory()
not multiple of MBLOCK_SIZE in the following fallback code:
```
if (at == NULL) {
*len -= *len / 8;
```
and caused assertion failure:
```
$ make fulltest TEST=T11607 WAY=threaded1
T11607: internal error: ASSERTION FAILED: file rts/posix/OSMem.c, line 457
(GHC version 8.7.
20180716 for riscv64_unknown_linux)
```
The change applies alignment mask before each MBLOCK allocation attempt
and fixes WAY=threaded1 test failures on qemu-riscv64.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Test Plan: run 'make fulltest WAY=threaded1'
Reviewers: simonmar, bgamari, erikd
Reviewed By: simonmar
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4982
Gbp-Pq: Name
e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
driver: skip -Bsymbolic on unregisterised targets
Trac #15338 is yet another example where -Bsymbolic breaks
semantics of a C program: global variable duplication happens
and unsafePerformIO creates two stdout copies.
When -Bsymbolic is not used both C compiler and linker agree
on how global variables are handled. In case of sh4 it consists
on a few assertions:
1. global variable is exported from shared library
2. code is referred to this variable via GOT-like mechanism to allow
interposition
3. global variable is present .bss section on an executable
(as an R_*_COPY relocation: symbol contents is copied at executable
startup time)
4. and symbol in executable interposes symbol in shared library.
This way both code in shared library and code in executable refer
to a copy of global variable in .bss section of an executable.
Unfortunately -Bsymbolic option breaks assumption [2.] and generates
direct references to the symbol. This causes mismatch between
values seen from executable and values seen from shared library code.
This change disables '-Bsymbolic' for unregisterised targets.
Gbp-Pq: Name bsymbolic-only-for-registerised.patch
Debian Haskell Group [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
with new ghc 8.4.3, the armel situation seems to have improved,
apply this patch unconditionally.
===================================================================
Gbp-Pq: Name llvm-arm-unknown-linux-gnueabi.patch
John Paul Adrian Glaubitz [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +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 [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +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 [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +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 [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +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 [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +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 [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Sandro Tosi [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-3) unstable; urgency=medium
* Switch to python3-sphinx; Closes: #943097
[dgit import unpatched ghc 8.8.1+dfsg1+is+8.6.5+dfsg1-3]
Sandro Tosi [Tue, 24 Mar 2020 01:50:31 +0000 (01:50 +0000)]
Import ghc_8.8.1+dfsg1+is+8.6.5+dfsg1-3.debian.tar.xz
[dgit import tarball ghc 8.8.1+dfsg1+is+8.6.5+dfsg1-3 ghc_8.8.1+dfsg1+is+8.6.5+dfsg1-3.debian.tar.xz]
Ilias Tsitsimpis [Fri, 28 Feb 2020 08:56:27 +0000 (08:56 +0000)]
Import ghc_8.8.3.orig.tar.xz
[dgit import orig ghc_8.8.3.orig.tar.xz]
Raspbian automatic forward porter [Mon, 4 Nov 2019 06:37:08 +0000 (06:37 +0000)]
Merge version 8.4.4+dfsg1-3+rpi1 and 8.8.1+dfsg1+is+8.6.5+dfsg1-2 to produce 8.8.1+dfsg1+is+8.6.5+dfsg1-2+rpi1
Gianfranco Costamagna [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
Merge ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-2) import into refs/heads/workingbranch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
powerpc-fix-64-bit-comparision
$ ./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 [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
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 [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
risc-support
Gbp-Pq: Name risc-support.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
fix-build-using-unregisterized-v8.4
.
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
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
local-mathjax
Gbp-Pq: Name local-mathjax
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
kfreebsd-aclocal.m4
Gbp-Pq: Name kfreebsd-aclocal.m4
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
add_-latomic_to_ghc-prim
commit
ce3897ffd6e7c8b8f36b8e920168bac8c7f836ae
Author: Ilias Tsitsimpis <iliastsi@debian.org>
Date: Tue Sep 18 17:45:17 2018 +0200
Fix check whether GCC supports __atomic_ builtins
Summary:
C11 atomics are never used because:
* The program used for checking whether GCC supports
__atomic_ builtins fails with the following error:
```
error: size mismatch in argument 2 of `__atomic_load`
int test(int *x) { int y; __atomic_load(&x, &y, __ATOMIC_SEQ_CST); return x; }
```
* There is a typo when checking if CONF_GCC_SUPPORTS__ATOMICS equals YES,
resulting in PRIM_CFLAGS and PRIM_EXTRA_LIBRARIES never being set.
Reviewers: bgamari
Reviewed By: bgamari
Subscribers: rwbarton, erikd, carter
Differential Revision: https://phabricator.haskell.org/D5154
Gbp-Pq: Name add_-latomic_to_ghc-prim
Sergei Trofimovich [Wed, 18 Jul 2018 21:36:58 +0000 (22:36 +0100)]
fix osReserveHeapMemory block alignment
fix osReserveHeapMemory block alignment
Before the change osReserveHeapMemory() attempted
to allocate chunks of memory via osTryReserveHeapMemory()
not multiple of MBLOCK_SIZE in the following fallback code:
```
if (at == NULL) {
*len -= *len / 8;
```
and caused assertion failure:
```
$ make fulltest TEST=T11607 WAY=threaded1
T11607: internal error: ASSERTION FAILED: file rts/posix/OSMem.c, line 457
(GHC version 8.7.
20180716 for riscv64_unknown_linux)
```
The change applies alignment mask before each MBLOCK allocation attempt
and fixes WAY=threaded1 test failures on qemu-riscv64.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Test Plan: run 'make fulltest WAY=threaded1'
Reviewers: simonmar, bgamari, erikd
Reviewed By: simonmar
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4982
Gbp-Pq: Name
e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
bsymbolic-only-for-registerised
Gbp-Pq: Name bsymbolic-only-for-registerised.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
llvm-arm-unknown-linux-gnueabi
===================================================================
Gbp-Pq: Name llvm-arm-unknown-linux-gnueabi.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
use-stage1-binaries-for-install
Gbp-Pq: Name use-stage1-binaries-for-install.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
x32-use-native-x86_64-insn
Gbp-Pq: Name x32-use-native-x86_64-insn.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
buildpath-abi-stability
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Gbp-Pq: Name buildpath-abi-stability.patch
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
no-missing-haddock-file-warning
Gbp-Pq: Name no-missing-haddock-file-warning
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
ARM-VFPv3D16
Gbp-Pq: Name ARM-VFPv3D16
Debian Haskell Group [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
use-debian-gen_contents_index
===================================================================
Gbp-Pq: Name use-debian-gen_contents_index
Gianfranco Costamagna [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
ghc (8.8.1+dfsg1+is+8.6.5+dfsg1-2) unstable; urgency=medium
[ John Paul Adrian Glaubitz ]
* Enable workaround to avoid memory exhaustation on alpha
[ Gianfranco Costamagna ]
* Source-only reupload now that the bootstrap has ended
[dgit import unpatched ghc 8.8.1+dfsg1+is+8.6.5+dfsg1-2]
Gianfranco Costamagna [Sat, 21 Sep 2019 10:06:31 +0000 (11:06 +0100)]
Import ghc_8.8.1+dfsg1+is+8.6.5+dfsg1-2.debian.tar.xz
[dgit import tarball ghc 8.8.1+dfsg1+is+8.6.5+dfsg1-2 ghc_8.8.1+dfsg1+is+8.6.5+dfsg1-2.debian.tar.xz]