[DHG_packages] 01/01: ghc: probably want this uploaded

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch experimental
in repository DHG_packages.

commit 8de661457e44fc3ba977a038d638bf6cd5ad891d
Author: Clint Adams <clint at debian.org>
Date:   Thu Oct 20 14:03:38 2016 -0400

    ghc: probably want this uploaded
---
 p/ghc/debian/changelog                           |   2 +-
 p/ghc/debian/patches/add-missing-MO_WriteBarrier |   4 +-
 p/ghc/debian/patches/ppc-smp-primitives          | 100 -----------------------
 p/ghc/debian/patches/series                      |   1 -
 4 files changed, 2 insertions(+), 105 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index daecfb9..92404ed 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,4 +1,4 @@
-ghc (8.0.1-4) UNRELEASED; urgency=medium
+ghc (8.0.1-4) experimental; urgency=medium
 
   [ Balint Reczey ]
   * Disable PIE to fix build when PIE is the default in gcc
diff --git a/p/ghc/debian/patches/add-missing-MO_WriteBarrier b/p/ghc/debian/patches/add-missing-MO_WriteBarrier
index 83f22a7..0d5ab74 100644
--- a/p/ghc/debian/patches/add-missing-MO_WriteBarrier
+++ b/p/ghc/debian/patches/add-missing-MO_WriteBarrier
@@ -20,11 +20,9 @@ GHC Trac Issues: #12469
 (cherry picked from commit d40d6df74a9fca382a84709ac9bc862897fbec18)
 ---
 
-diff --git a/compiler/codeGen/StgCmmPrim.hs b/compiler/codeGen/StgCmmPrim.hs
-index 5d3b94f..3cb9f83 100644
 --- a/compiler/codeGen/StgCmmPrim.hs
 +++ b/compiler/codeGen/StgCmmPrim.hs
-@@ -310,8 +310,11 @@ emitPrimOp _ [res] GetCurrentCCSOp [_dummy_arg]
+@@ -310,8 +310,11 @@
  emitPrimOp dflags [res] ReadMutVarOp [mutv]
     = emitAssign (CmmLocal res) (cmmLoadIndexW dflags mutv (fixedHdrSizeW dflags) (gcWord dflags))
  
diff --git a/p/ghc/debian/patches/ppc-smp-primitives b/p/ghc/debian/patches/ppc-smp-primitives
deleted file mode 100644
index 11b4108..0000000
--- a/p/ghc/debian/patches/ppc-smp-primitives
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Peter Trommler <ptrommler at acm.org>
-Date: Mon, 16 May 2016 13:19:09 +0000 (+0200)
-Subject: PPC: Implement SMP primitives using gcc built-ins
-X-Git-Tag: ghc-8.0.1-release~11
-X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/f4e6b32831bd718a040b382865ac7aea1254bf4e
-
-PPC: Implement SMP primitives using gcc built-ins
-
-The SMP primitives were missing appropriate memory barriers
-(sync, isync instructions) on all PowerPCs.
-
-Use the built-ins _sync_* provided by gcc and clang. This
-reduces code size significantly.
-
-Remove broken mark for concprog001 on powerpc64. The referenced
-ticket number (11259) was wrong.
-
-Test Plan: validate on powerpc and ARM
-
-Reviewers: erikd, austin, simonmar, bgamari, hvr
-
-Reviewed By: bgamari, hvr
-
-Subscribers: thomie
-
-Differential Revision: https://phabricator.haskell.org/D2225
-
-GHC Trac Issues: #12070
-
-(cherry picked from commit 563a4857abcee4a6e43c68323274309c58f42aa0)
----
-
---- a/includes/stg/SMP.h
-+++ b/includes/stg/SMP.h
-@@ -119,14 +119,8 @@
-           :"+r" (result), "+m" (*p)
-           : /* no input-only operands */
-         );
--#elif powerpc_HOST_ARCH
--    __asm__ __volatile__ (
--        "1:     lwarx     %0, 0, %2\n"
--        "       stwcx.    %1, 0, %2\n"
--        "       bne-      1b"
--        :"=&r" (result)
--        :"r" (w), "r" (p)
--    );
-+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
-+    result = __sync_lock_test_and_set(p, w);
- #elif sparc_HOST_ARCH
-     result = w;
-     __asm__ __volatile__ (
-@@ -194,20 +188,8 @@
-           :"=a"(o), "+m" (*(volatile unsigned int *)p)
-           :"0" (o), "r" (n));
-     return o;
--#elif powerpc_HOST_ARCH
--    StgWord result;
--    __asm__ __volatile__ (
--        "1:     lwarx     %0, 0, %3\n"
--        "       cmpw      %0, %1\n"
--        "       bne       2f\n"
--        "       stwcx.    %2, 0, %3\n"
--        "       bne-      1b\n"
--        "2:"
--        :"=&r" (result)
--        :"r" (o), "r" (n), "r" (p)
--        :"cc", "memory"
--    );
--    return result;
-+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
-+    return __sync_val_compare_and_swap(p, o, n);
- #elif sparc_HOST_ARCH
-     __asm__ __volatile__ (
-         "cas [%1], %2, %0"
-@@ -268,6 +250,7 @@
- 
- // RRN: Generalized to arbitrary increments to enable fetch-and-add in
- // Haskell code (fetchAddIntArray#).
-+// PT: add-and-fetch, returns new value
- EXTERN_INLINE StgWord
- atomic_inc(StgVolatilePtr p, StgWord incr)
- {
-@@ -279,6 +262,8 @@
-             "+r" (r), "+m" (*p):
-     );
-     return r + incr;
-+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
-+    return __sync_add_and_fetch(p, incr);
- #else
-     StgWord old, new_;
-     do {
-@@ -300,6 +285,8 @@
-             "+r" (r), "+m" (*p):
-     );
-     return r-1;
-+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
-+    return __sync_sub_and_fetch(p, (StgWord) 1);
- #else
-     StgWord old, new_;
-     do {
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 6efbe64..5de9d7a 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -5,5 +5,4 @@ hurd.diff
 buildpath-abi-stability.patch
 reproducible-tmp-names
 do-not-use-SHELL
-ppc-smp-primitives
 add-missing-MO_WriteBarrier

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git