[Git][haskell-team/DHG_packages][master] ghc: Cherry pick upstream fixes for Big Endian systems (from Ubuntu)

[Gianfranco Costamagna]

Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
82ec78c0 by Gianfranco Costamagna at 2020-07-22T10:55:26+02:00
ghc: Cherry pick upstream fixes for Big Endian systems (from Ubuntu)

- - - - -


4 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
- + p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,7 +1,9 @@
 ghc (8.8.3-2) UNRELEASED; urgency=medium
 
+  * Cherry-pick Ubuntu patches
   * Also limit parallel building to 2 on arm64, because Ubuntu fails
     with ENOMEM with parallel=4
+  * Fix ByteOrder on s390x.
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 28 May 2020 13:45:02 +0200
 


=====================================
p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
=====================================
@@ -0,0 +1,37 @@
+From 11f8eef5a9625c77f78a829406c446b615ed6168 Mon Sep 17 00:00:00 2001
+From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
+Date: Wed, 11 Dec 2019 07:47:16 +0100
+Subject: [PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
+
+---
+ libraries/base/GHC/ByteOrder.hs                | 2 +-
+ libraries/base/GHC/IO/Encoding/CodePage/API.hs | 2 +-
+ testsuite/tests/codeGen/should_run/T7600.hs    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+===================================================================
+--- ghc-8.8.3.orig/libraries/base/GHC/ByteOrder.hs
++++ ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+@@ -18,7 +18,7 @@
+ module GHC.ByteOrder where
+ 
+ -- Required for WORDS_BIGENDIAN
+-#include "ghcautoconf.h"
++#include <ghcautoconf.h>
+ 
+ -- | Byte ordering.
+ data ByteOrder
+Index: ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+===================================================================
+--- ghc-8.8.3.orig/libraries/base/GHC/IO/Encoding/CodePage/API.hs
++++ ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+@@ -8,7 +8,7 @@ module GHC.IO.Encoding.CodePage.API (
+   ) where
+ 
+ -- Required for WORDS_BIGENDIAN
+-#include "ghcautoconf.h"
++#include <ghcautoconf.h>
+ 
+ import Foreign.C
+ import Foreign.Ptr


=====================================
p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
=====================================
@@ -0,0 +1,42 @@
+From 3c12355ece0fa14e534c71a9f7327eda9773fad9 Mon Sep 17 00:00:00 2001
+From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
+Date: Mon, 9 Dec 2019 15:41:57 +0100
+Subject: [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).
+---
+ libraries/base/GHC/ByteOrder.hs                | 3 +++
+ libraries/base/GHC/IO/Encoding/CodePage/API.hs | 3 +++
+ testsuite/tests/codeGen/should_run/T7600.hs    | 4 ++++
+ 3 files changed, 10 insertions(+)
+
+Index: ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+===================================================================
+--- ghc-8.8.3.orig/libraries/base/GHC/ByteOrder.hs
++++ ghc-8.8.3/libraries/base/GHC/ByteOrder.hs
+@@ -17,6 +17,9 @@
+ 
+ module GHC.ByteOrder where
+ 
++-- Required for WORDS_BIGENDIAN
++#include "ghcautoconf.h"
++
+ -- | Byte ordering.
+ data ByteOrder
+     = BigEndian    -- ^ most-significant-byte occurs in lowest address.
+Index: ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+===================================================================
+--- ghc-8.8.3.orig/libraries/base/GHC/IO/Encoding/CodePage/API.hs
++++ ghc-8.8.3/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+@@ -7,6 +7,9 @@ module GHC.IO.Encoding.CodePage.API (
+     mkCodePageEncoding
+   ) where
+ 
++-- Required for WORDS_BIGENDIAN
++#include "ghcautoconf.h"
++
+ import Foreign.C
+ import Foreign.Ptr
+ import Foreign.Marshal


=====================================
p/ghc/debian/patches/series
=====================================
@@ -10,3 +10,5 @@ fix-build-using-unregisterised-v8.6
 llvm-9.patch
 llvm-arm-unknown-linux-gnueabi.patch
 fix-32bit-atomic
+3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
+11f8eef5a9625c77f78a829406c446b615ed6168.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/82ec78c0739f28e6e4f28321f0c22c1dda714745

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/82ec78c0739f28e6e4f28321f0c22c1dda714745
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/20200722/ceb89ee5/attachment-0001.html>