[Git][haskell-team/DHG_packages][master] ghc:

[Gianfranco Costamagna (@locutusofborg)]

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


Commits:
db29494c by Gianfranco Costamagna at 2024-02-19T17:14:12+01:00
ghc:
  * debian/patches/dfe1c3540e4b519b62b862b5966dfec5cae9ece1.patch:
    - cherry-pick upstream fix for misaligned objects in the data section with
      llvm-based builds. (LP: #2052696)

- - - - -


3 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/dfe1c3540e4b519b62b862b5966dfec5cae9ece1.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+ghc (9.4.7-3) unstable; urgency=medium
+
+  * debian/patches/dfe1c3540e4b519b62b862b5966dfec5cae9ece1.patch:
+    - cherry-pick upstream fix for misaligned objects in the data section with
+      llvm-based builds. (LP: #2052696)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 19 Feb 2024 17:12:25 +0100
+
 ghc (9.4.7-2) unstable; urgency=medium
 
   * Remove files generated by gen_contents_index at installation time (Closes:


=====================================
p/ghc/debian/patches/dfe1c3540e4b519b62b862b5966dfec5cae9ece1.patch
=====================================
@@ -0,0 +1,31 @@
+From dfe1c3540e4b519b62b862b5966dfec5cae9ece1 Mon Sep 17 00:00:00 2001
+From: Stefan Schulze Frielinghaus <stefansf at linux.ibm.com>
+Date: Mon, 27 Nov 2023 12:34:47 +0100
+Subject: [PATCH] llvmGen: Align objects in the data section
+
+Objects in the data section may be referenced via tagged pointers.
+Thus, align those objects to a 4- or 8-byte boundary for 32- or 64-bit
+platforms, respectively.  Note, this may need to be reconsidered if
+objects with a greater natural alignment requirement are emitted as e.g.
+128-bit atomics.
+
+Fixes #24163.
+---
+ compiler/GHC/CmmToLlvm/Data.hs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compiler/GHC/CmmToLlvm/Data.hs b/compiler/GHC/CmmToLlvm/Data.hs
+index caac121413c..5e8912e3bc7 100644
+--- a/compiler/GHC/CmmToLlvm/Data.hs
++++ b/compiler/GHC/CmmToLlvm/Data.hs
+@@ -89,6 +89,7 @@ genLlvmData (sec, CmmStaticsRaw lbl xs) = do
+         align          = case sec of
+                             Section CString _ -> if (platformArch platform == ArchS390X)
+                                                     then Just 2 else Just 1
++                            Section Data _    -> Just $ platformWordSizeInBytes platform
+                             _                 -> Nothing
+         const          = if sectionProtection sec == ReadOnlySection
+                             then Constant else Global
+-- 
+GitLab
+


=====================================
p/ghc/debian/patches/series
=====================================
@@ -22,3 +22,4 @@ hadrian-fix-dnosmp
 hadrian-enable-interpreter
 use-modern-atomics
 ppc64el-fix-clrri
+dfe1c3540e4b519b62b862b5966dfec5cae9ece1.patch



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/db29494cbbc5b14481e4b24c0912f0bad53af91a
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/20240219/7644e1b5/attachment-0001.htm>