[Git][haskell-team/DHG_packages][experimental] 2 commits: ghc: Remove unused patch

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
72afb574 by Ilias Tsitsimpis at 2020-03-01T18:58:16+02:00
ghc: Remove unused patch

- - - - -
bfe86ecf by Ilias Tsitsimpis at 2020-03-01T19:01:15+02:00
ghc: Patch for mipsel

- - - - -


4 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/fix-32bit-atomic
- − p/ghc/debian/patches/fix-build-sphinx.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ghc (8.8.3-1~exp2) experimental; urgency=medium
+
+  * Patch to remove hs_atomic{read,write}64 from non-64bit systems.
+    This fixes compilation on mipsel and powerpc.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 01 Mar 2020 19:01:10 +0200
+
 ghc (8.8.3-1~exp1) experimental; urgency=medium
 
   * New upstream release


=====================================
p/ghc/debian/patches/fix-32bit-atomic
=====================================
@@ -0,0 +1,39 @@
+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-build-sphinx.patch deleted
=====================================
@@ -1,37 +0,0 @@
-Origin: https://git.haskell.org/ghc.git/commitdiff/a257782f56e5e330349d4cc7db71e297d8396c67
-diff -Nru ghc-8.4.4+dfsg1/docs/users_guide/flags.py ghc-8.6.3+dfsg1/docs/users_guide/flags.py
---- ghc-8.4.4+dfsg1/docs/users_guide/flags.py	2017-11-28 17:39:29.000000000 +0100
-+++ ghc-8.6.3+dfsg1/docs/users_guide/flags.py	2018-09-21 00:18:23.000000000 +0200
-@@ -46,9 +46,11 @@
- 
- from docutils import nodes
- from docutils.parsers.rst import Directive, directives
-+import sphinx
- from sphinx import addnodes
- from sphinx.domains.std import GenericObject
- from sphinx.errors import SphinxError
-+from distutils.version import LooseVersion
- from utils import build_table_from_list
- 
- ### Settings
-@@ -597,14 +599,18 @@
- ### Initialization
- 
- def setup(app):
-+    # The override argument to add_directive_to_domain is only supported by >= 1.8
-+    sphinx_version = LooseVersion(sphinx.__version__)
-+    override_arg = {'override': True} if sphinx_version >= LooseVersion('1.8') else {}
- 
-     # Add ghc-flag directive, and override the class with our own
-     app.add_object_type('ghc-flag', 'ghc-flag')
--    app.add_directive_to_domain('std', 'ghc-flag', Flag)
-+    app.add_directive_to_domain('std', 'ghc-flag', Flag, **override_arg)
- 
-     # Add extension directive, and override the class with our own
-     app.add_object_type('extension', 'extension')
--    app.add_directive_to_domain('std', 'extension', LanguageExtension)
-+    app.add_directive_to_domain('std', 'extension', LanguageExtension,
-+                                **override_arg)
-     # NB: language-extension would be misinterpreted by sphinx, and produce
-     # lang="extensions" XML attributes
- 


=====================================
p/ghc/debian/patches/series
=====================================
@@ -9,3 +9,4 @@ local-mathjax
 fix-build-using-unregisterised-v8.6
 llvm-9.patch
 llvm-arm-unknown-linux-gnueabi.patch
+fix-32bit-atomic



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/57f407bb52ae76c8dc8786ce45d5c2cf3b517adb...bfe86ecf0f688b5a7eb99ce166de39fd1d759e90

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/57f407bb52ae76c8dc8786ce45d5c2cf3b517adb...bfe86ecf0f688b5a7eb99ce166de39fd1d759e90
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/20200301/fd8cfef0/attachment-0001.html>