[Git][haskell-team/DHG_packages][experimental] 4 commits: ghc: Drop upstream patches included in 8.8.1 release
Gianfranco Costamagna
gitlab at salsa.debian.org
Tue Sep 10 14:53:00 BST 2019
Gianfranco Costamagna pushed to branch experimental at Debian Haskell Group / DHG_packages
Commits:
b6be1c63 by Gianfranco Costamagna at 2019-09-10T13:51:45Z
ghc: Drop upstream patches included in 8.8.1 release
- - - - -
ec78fac9 by Gianfranco Costamagna at 2019-09-10T13:52:07Z
ghc: refresh patches
- - - - -
e703e1eb by Gianfranco Costamagna at 2019-09-10T13:52:07Z
ghc: switch to unversioned llvm implementation
- - - - -
843239f1 by Gianfranco Costamagna at 2019-09-10T13:52:07Z
ghc: upload to experimental
- - - - -
17 changed files:
- p/ghc/debian/changelog
- p/ghc/debian/control
- p/ghc/debian/patches/ARM-VFPv3D16
- − p/ghc/debian/patches/PprC-Add-support-for-adjacent-floats
- − p/ghc/debian/patches/add_-latomic_to_ghc-prim
- − p/ghc/debian/patches/bsymbolic-only-for-registerised.patch
- p/ghc/debian/patches/buildpath-abi-stability.patch
- − p/ghc/debian/patches/e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
- p/ghc/debian/patches/kfreebsd-aclocal.m4
- p/ghc/debian/patches/llvm-arm-unknown-linux-gnueabi.patch
- p/ghc/debian/patches/no-missing-haddock-file-warning
- − p/ghc/debian/patches/powerpc-fix-64-bit-comparision.patch
- − p/ghc/debian/patches/risc-support.patch
- p/ghc/debian/patches/series
- p/ghc/debian/patches/use-debian-gen_contents_index
- p/ghc/debian/patches/use-stage1-binaries-for-install.patch
- p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
Changes:
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,17 @@
+ghc (8.8.1+dfsg1-1~exp1) experimental; urgency=medium
+
+ * New upstream release, patch refresh
+ * Drop upstream patches:
+ - bsymbolic-only-for-registerised.patch
+ - e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
+ - add_-latomic_to_ghc-prim
+ - risc-support.patch
+ - PprC-Add-support-for-adjacent-floats
+ - powerpc-fix-64-bit-comparision.patch
+ * Switch to default llvm version
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 10 Sep 2019 12:53:10 +0200
+
ghc (8.6.5+dfsg1-4) unstable; urgency=medium
[ John Paul Adrian Glaubitz ]
=====================================
p/ghc/debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends:
pkg-config,
ghc:native (>= 8.4),
libgmp-dev,
- llvm-6.0 [arm64 armel armhf],
+ llvm [arm64 armel armhf],
libffi-dev,
libncurses5-dev,
python-sphinx <!cross>,
@@ -29,7 +29,7 @@ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/gh
Package: ghc
Architecture: any
Depends:
- llvm-6.0 [arm64 armel armhf],
+ llvm [arm64 armel armhf],
gcc,
libgmp-dev,
libffi-dev,
@@ -52,7 +52,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-6.0
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
Description: The Glasgow Haskell Compilation system
The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
Haskell.
=====================================
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: ghc-8.8.1+dfsg1/aclocal.m4
===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -454,7 +454,7 @@ AC_DEFUN([GET_ARM_ISA],
+--- ghc-8.8.1+dfsg1.orig/aclocal.m4
++++ ghc-8.8.1+dfsg1/aclocal.m4
+@@ -454,7 +454,7 @@
)],
[changequote(, )dnl
ARM_ISA=ARMv7
=====================================
p/ghc/debian/patches/PprC-Add-support-for-adjacent-floats deleted
=====================================
@@ -1,64 +0,0 @@
-commit 35a897782b6b0a252da7fdcf4921198ad4e1d96c
-Author: James Clarke <jrtc27 at 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
-
-Index: b/compiler/cmm/PprC.hs
-===================================================================
---- a/compiler/cmm/PprC.hs
-+++ b/compiler/cmm/PprC.hs
-@@ -512,9 +512,12 @@ pprLit1 other = pprLit other
- pprStatics :: DynFlags -> [CmmStatic] -> [SDoc]
- pprStatics _ [] = []
- pprStatics dflags (CmmStaticLit (CmmFloat f W32) : rest)
-- -- floats are padded to a word by padLitToWord, see #1852
-+ -- odd numbers of floats are padded to a word by mkVirtHeapOffsetsWithPadding
- | wORD_SIZE dflags == 8, CmmStaticLit (CmmInt 0 W32) : rest' <- rest
- = pprLit1 (floatToWord dflags f) : pprStatics dflags rest'
-+ -- adjacent floats aren't padded but combined into a single word
-+ | wORD_SIZE dflags == 8, CmmStaticLit (CmmFloat g W32) : rest' <- rest
-+ = pprLit1 (floatPairToWord dflags f g) : pprStatics dflags rest'
- | wORD_SIZE dflags == 4
- = pprLit1 (floatToWord dflags f) : pprStatics dflags rest
- | otherwise
-@@ -1261,6 +1264,25 @@ floatToWord dflags r
- , wORDS_BIGENDIAN dflags = 32
- | otherwise = 0
-
-+floatPairToWord :: DynFlags -> Rational -> Rational -> CmmLit
-+floatPairToWord dflags r1 r2
-+ = runST (do
-+ arr <- newArray_ ((0::Int),1)
-+ writeArray arr 0 (fromRational r1)
-+ writeArray arr 1 (fromRational r2)
-+ arr' <- castFloatToWord32Array arr
-+ w32_1 <- readArray arr' 0
-+ w32_2 <- readArray arr' 1
-+ return (pprWord32Pair w32_1 w32_2)
-+ )
-+ where pprWord32Pair w32_1 w32_2
-+ | wORDS_BIGENDIAN dflags =
-+ CmmInt ((shiftL i1 32) .|. i2) W64
-+ | otherwise =
-+ CmmInt ((shiftL i2 32) .|. i1) W64
-+ where i1 = toInteger w32_1
-+ i2 = toInteger w32_2
-+
- doubleToWords :: DynFlags -> Rational -> [CmmLit]
- doubleToWords dflags r
- = runST (do
=====================================
p/ghc/debian/patches/add_-latomic_to_ghc-prim deleted
=====================================
@@ -1,54 +0,0 @@
-commit ce3897ffd6e7c8b8f36b8e920168bac8c7f836ae
-Author: Ilias Tsitsimpis <iliastsi at 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
-
-Index: b/libraries/ghc-prim/aclocal.m4
-===================================================================
---- a/libraries/ghc-prim/aclocal.m4
-+++ b/libraries/ghc-prim/aclocal.m4
-@@ -5,7 +5,7 @@ AC_DEFUN([FP_GCC_SUPPORTS__ATOMICS],
- [
- AC_REQUIRE([AC_PROG_CC])
- AC_MSG_CHECKING([whether GCC supports __atomic_ builtins])
-- echo 'int test(int *x) { int y; __atomic_load(&x, &y, __ATOMIC_SEQ_CST); return x; }' > conftest.c
-+ echo 'int test(int *x) { int y; __atomic_load(x, &y, __ATOMIC_SEQ_CST); return y; }' > conftest.c
- if $CC -c conftest.c > /dev/null 2>&1; then
- CONF_GCC_SUPPORTS__ATOMICS=YES
- AC_MSG_RESULT([yes])
-Index: b/libraries/ghc-prim/configure.ac
-===================================================================
---- a/libraries/ghc-prim/configure.ac
-+++ b/libraries/ghc-prim/configure.ac
-@@ -8,7 +8,7 @@ dnl unregisterised, Sparc, and PPC ba
- FP_GCC_SUPPORTS__ATOMICS
- AC_DEFINE([HAVE_C11_ATOMICS], [$CONF_GCC_SUPPORTS__ATOMICS], [Does GCC support __atomic primitives?])
-
--if test "x$CONF_GCC_SUPPORTS__ATOMICS" = YES
-+if test "$CONF_GCC_SUPPORTS__ATOMICS" = "YES"
- then PRIM_CFLAGS=-DHAVE_C11_ATOMICS
- PRIM_EXTRA_LIBRARIES=atomic
- fi
=====================================
p/ghc/debian/patches/bsymbolic-only-for-registerised.patch deleted
=====================================
@@ -1,73 +0,0 @@
-Description: 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.
-
-Index: b/compiler/main/SysTools.hs
-===================================================================
---- a/compiler/main/SysTools.hs
-+++ b/compiler/main/SysTools.hs
-@@ -548,9 +548,12 @@ linkDynLib dflags0 o_files dep_packages
- -------------------------------------------------------------------
-
- let output_fn = case o_file of { Just s -> s; Nothing -> "a.out"; }
-+ unregisterised = platformUnregisterised (targetPlatform dflags)
- let bsymbolicFlag = -- we need symbolic linking to resolve
-- -- non-PIC intra-package-relocations
-- ["-Wl,-Bsymbolic"]
-+ -- non-PIC intra-package-relocations for
-+ -- performance (where symbolic linking works)
-+ -- See Note [-Bsymbolic assumptions by GHC]
-+ ["-Wl,-Bsymbolic" | not unregisterised]
-
- runLink dflags (
- map Option verbFlags
-@@ -607,3 +610,27 @@ getFrameworkOpts dflags platform
- -- reverse because they're added in reverse order from the cmd line:
- framework_opts = concat [ ["-framework", fw]
- | fw <- reverse frameworks ]
-+
-+{-
-+Note [-Bsymbolic assumptions by GHC]
-+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+GHC has a few assumptions about interaction of relocations in NCG and linker:
-+
-+1. -Bsymbolic resolves internal references when the shared library is linked,
-+ which is important for performance.
-+2. When there is a reference to data in a shared library from the main program,
-+ the runtime linker relocates the data object into the main program using an
-+ R_*_COPY relocation.
-+3. If we used -Bsymbolic, then this results in multiple copies of the data
-+ object, because some references have already been resolved to point to the
-+ original instance. This is bad!
-+
-+We work around [3.] for native compiled code by avoiding the generation of
-+R_*_COPY relocations.
-+
-+Unregisterised compiler can't evade R_*_COPY relocations easily thus we disable
-+-Bsymbolic linking there.
-+
-+See related Trac tickets: #4210, #15338
-+-}
=====================================
p/ghc/debian/patches/buildpath-abi-stability.patch
=====================================
@@ -1,10 +1,10 @@
Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
-Index: ghc-8.6.4/compiler/iface/MkIface.hs
+Index: ghc-8.8.1+dfsg1/compiler/iface/MkIface.hs
===================================================================
---- ghc-8.6.4.orig/compiler/iface/MkIface.hs
-+++ ghc-8.6.4/compiler/iface/MkIface.hs
-@@ -712,7 +712,7 @@
+--- ghc-8.8.1+dfsg1.orig/compiler/iface/MkIface.hs
++++ ghc-8.8.1+dfsg1/compiler/iface/MkIface.hs
+@@ -713,7 +713,7 @@
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -13,7 +13,7 @@ Index: ghc-8.6.4/compiler/iface/MkIface.hs
sorted_deps,
mi_hpc iface0)
-@@ -747,6 +747,9 @@
+@@ -748,6 +748,9 @@
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
=====================================
p/ghc/debian/patches/e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch deleted
=====================================
@@ -1,63 +0,0 @@
-From: Sergei Trofimovich <slyfox at gentoo.org>
-Date: Wed, 18 Jul 2018 22:36:58 +0000 (+0100)
-Subject: 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 at 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
----
-
-Index: b/rts/posix/OSMem.c
-===================================================================
---- a/rts/posix/OSMem.c
-+++ b/rts/posix/OSMem.c
-@@ -476,6 +476,8 @@ osTryReserveHeapMemory (W_ len, void *hi
- void *base, *top;
- void *start, *end;
-
-+ ASSERT((len & ~MBLOCK_MASK) == len);
-+
- /* We try to allocate len + MBLOCK_SIZE,
- because we need memory which is MBLOCK_SIZE aligned,
- and then we discard what we don't need */
-@@ -552,6 +554,8 @@ void *osReserveHeapMemory(void *startAdd
-
- attempt = 0;
- while (1) {
-+ *len &= ~MBLOCK_MASK;
-+
- if (*len < MBLOCK_SIZE) {
- // Give up if the system won't even give us 16 blocks worth of heap
- barf("osReserveHeapMemory: Failed to allocate heap storage");
=====================================
p/ghc/debian/patches/kfreebsd-aclocal.m4
=====================================
@@ -2,11 +2,11 @@ Description: Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
Author: Svante Signell <svante.signell at gmail.com>
Bug-Debian: https://bugs.debian.org/913140
-Index: b/aclocal.m4
+Index: ghc-8.8.1+dfsg1/aclocal.m4
===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -2014,7 +2014,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
+--- ghc-8.8.1+dfsg1.orig/aclocal.m4
++++ ghc-8.8.1+dfsg1/aclocal.m4
+@@ -2045,7 +2045,7 @@
$3="openbsd"
;;
# As far as I'm aware, none of these have relevant variants
@@ -15,7 +15,7 @@ Index: b/aclocal.m4
$3="$1"
;;
msys)
-@@ -2034,6 +2034,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
+@@ -2065,6 +2065,9 @@
# i686-gentoo-freebsd8.2
$3="freebsd"
;;
=====================================
p/ghc/debian/patches/llvm-arm-unknown-linux-gnueabi.patch
=====================================
@@ -1,9 +1,9 @@
Description: with new ghc 8.4.3, the armel situation seems to have improved,
apply this patch unconditionally.
-Index: b/llvm-targets
+Index: ghc-8.8.1+dfsg1/llvm-targets
===================================================================
---- a/llvm-targets
-+++ b/llvm-targets
+--- ghc-8.8.1+dfsg1.orig/llvm-targets
++++ ghc-8.8.1+dfsg1/llvm-targets
@@ -3,6 +3,7 @@
,("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"))
=====================================
p/ghc/debian/patches/no-missing-haddock-file-warning
=====================================
@@ -3,11 +3,11 @@ Description: Do not emit a warning if the .haddock file is missing
without the -doc package.
Author: Joachim Breitner <nomeata at debian.org>
-Index: b/utils/ghc-pkg/Main.hs
+Index: ghc-8.8.1+dfsg1/utils/ghc-pkg/Main.hs
===================================================================
---- a/utils/ghc-pkg/Main.hs
-+++ b/utils/ghc-pkg/Main.hs
-@@ -1888,8 +1888,10 @@ checkPackageConfig pkg verbosity db_stac
+--- ghc-8.8.1+dfsg1.orig/utils/ghc-pkg/Main.hs
++++ ghc-8.8.1+dfsg1/utils/ghc-pkg/Main.hs
+@@ -1876,8 +1876,10 @@
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/powerpc-fix-64-bit-comparision.patch deleted
=====================================
@@ -1,29 +0,0 @@
-Description: 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 at gentoo.org>
- .
-Origin: https://gitlab.haskell.org/ghc/ghc/commit/25dce3fc05e4788240ac6d192919063a9f548f7f
-Last-Update: 2019-08-09
-
---- ghc-8.6.5+dfsg1.orig/compiler/nativeGen/PPC/CodeGen.hs
-+++ ghc-8.6.5+dfsg1/compiler/nativeGen/PPC/CodeGen.hs
-@@ -923,6 +923,7 @@ condIntCode' True cond W64 x y
- , BCC LE cmp_lo Nothing
- , CMPL II32 x_lo (RIReg y_lo)
- , BCC ALWAYS end_lbl Nothing
-+ , NEWBLOCK cmp_lo
- , CMPL II32 y_lo (RIReg x_lo)
- , BCC ALWAYS end_lbl Nothing
-
=====================================
p/ghc/debian/patches/risc-support.patch deleted
=====================================
@@ -1,31 +0,0 @@
-Description: cherry-pick of upstream commits
- beba89a0f16681c85d39fc8a894bde4162ff492a.patch:
- 5e63a25249f3cb07300258e115af9ff55079d2ea.patch:
-Last-Update: 2019-05-27
-
-Index: b/aclocal.m4
-===================================================================
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -217,7 +217,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
- mipsel)
- test -z "[$]2" || eval "[$]2=ArchMipsel"
- ;;
-- hppa|hppa1_1|ia64|m68k|nios2|rs6000|s390|s390x|sh4|vax)
-+ hppa|hppa1_1|ia64|m68k|nios2|riscv32|riscv64|rs6000|s390|s390x|sh4|vax)
- test -z "[$]2" || eval "[$]2=ArchUnknown"
- ;;
- *)
-@@ -1906,6 +1906,12 @@ case "$1" in
- powerpc*)
- $2="powerpc"
- ;;
-+ riscv64*)
-+ $2="riscv64"
-+ ;;
-+ riscv|riscv32*)
-+ $2="riscv32"
-+ ;;
- rs6000)
- $2="rs6000"
- ;;
=====================================
p/ghc/debian/patches/series
=====================================
@@ -5,12 +5,6 @@ buildpath-abi-stability.patch
x32-use-native-x86_64-insn.patch
use-stage1-binaries-for-install.patch
llvm-arm-unknown-linux-gnueabi.patch
-bsymbolic-only-for-registerised.patch
-e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
-add_-latomic_to_ghc-prim
kfreebsd-aclocal.m4
local-mathjax
fix-build-using-unregisterized-v8.4
-risc-support.patch
-PprC-Add-support-for-adjacent-floats
-powerpc-fix-64-bit-comparision.patch
=====================================
p/ghc/debian/patches/use-debian-gen_contents_index
=====================================
@@ -1,8 +1,8 @@
-Index: b/ghc.mk
+Index: ghc-8.8.1+dfsg1/ghc.mk
===================================================================
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -809,7 +809,6 @@ endif
+--- ghc-8.8.1+dfsg1.orig/ghc.mk
++++ ghc-8.8.1+dfsg1/ghc.mk
+@@ -811,7 +811,6 @@
# 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
-@@ -942,12 +941,8 @@ endif
+@@ -944,12 +943,8 @@
$(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 \
-@@ -1068,7 +1063,6 @@ $(eval $(call bindist-list,.,\
+@@ -1070,7 +1065,6 @@
mk/project.mk \
mk/install.mk.in \
bindist.mk \
=====================================
p/ghc/debian/patches/use-stage1-binaries-for-install.patch
=====================================
@@ -7,11 +7,11 @@ Description: Use the stage1 binaries for install
Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
Last-Update: 2017-01-29
-Index: b/ghc.mk
+Index: ghc-8.8.1+dfsg1/ghc.mk
===================================================================
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -961,8 +961,12 @@ else # CrossCompiling
+--- ghc-8.8.1+dfsg1.orig/ghc.mk
++++ ghc-8.8.1+dfsg1/ghc.mk
+@@ -963,8 +963,12 @@
# Install packages in the right order, so that ghc-pkg doesn't complain.
# Also, install ghc-pkg first.
ifeq "$(Windows_Host)" "NO"
=====================================
p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
=====================================
@@ -12,11 +12,11 @@ Description: Use native x86_64 instructions on x32
See: https://ghc.haskell.org/trac/ghc/ticket/11571
.
-Index: b/rts/RtsSymbols.c
+Index: ghc-8.8.1+dfsg1/rts/RtsSymbols.c
===================================================================
---- a/rts/RtsSymbols.c
-+++ b/rts/RtsSymbols.c
-@@ -934,7 +934,7 @@
+--- ghc-8.8.1+dfsg1.orig/rts/RtsSymbols.c
++++ ghc-8.8.1+dfsg1/rts/RtsSymbols.c
+@@ -939,7 +939,7 @@
// 64-bit support functions in libgcc.a
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/1cc5563205385efaf3aea1b56e5f33e4feb91eb9...843239f1c5f009a5d0d381b78bac49b0019eb578
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/1cc5563205385efaf3aea1b56e5f33e4feb91eb9...843239f1c5f009a5d0d381b78bac49b0019eb578
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/20190910/0671fa1f/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list