[Git][haskell-team/DHG_packages][master] 11 commits: ghc: from Peng Fan <fanpeng at loongson.cn>: Pass the mcmodel=medium parameter to CC via GHC
Gianfranco Costamagna (@locutusofborg)
gitlab at salsa.debian.org
Tue Mar 25 09:49:58 GMT 2025
Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
534391ca by Gianfranco Costamagna at 2025-03-25T10:40:56+01:00
ghc: from Peng Fan <fanpeng at loongson.cn>: Pass the mcmodel=medium parameter to CC via GHC
- - - - -
dc73a035 by Gianfranco Costamagna at 2025-03-25T10:42:03+01:00
ghc: set Origin for the new patch
- - - - -
6bd2da59 by Gianfranco Costamagna at 2025-03-25T10:43:33+01:00
ghc: Update changelog
- - - - -
f86fde7b by Gianfranco Costamagna at 2025-03-25T10:47:26+01:00
haskell-clash-ghc: drop loong64 hack, now that gcc is fixed
- - - - -
4365017a by Gianfranco Costamagna at 2025-03-25T10:47:45+01:00
haskell-isocline: drop loong64 hack, now that gcc is fixed
- - - - -
4d93c4e2 by Gianfranco Costamagna at 2025-03-25T10:48:01+01:00
haskell-lua: drop loong64 hack, now that gcc is fixed
- - - - -
5fc11e23 by Gianfranco Costamagna at 2025-03-25T10:48:12+01:00
haskell-pandoc-lua-engine: drop loong64 hack, now that gcc is fixed
- - - - -
d30d80a0 by Gianfranco Costamagna at 2025-03-25T10:48:20+01:00
haskell-pandoc: drop loong64 hack, now that gcc is fixed
- - - - -
151e13e9 by Gianfranco Costamagna at 2025-03-25T10:48:28+01:00
haskell-primitive: drop loong64 hack, now that gcc is fixed
- - - - -
fb3c8993 by Gianfranco Costamagna at 2025-03-25T10:48:38+01:00
haskell-splitmix: drop loong64 hack, now that gcc is fixed
- - - - -
f45cfe87 by Gianfranco Costamagna at 2025-03-25T10:48:47+01:00
haskell-zlib: drop loong64 hack, now that gcc is fixed
- - - - -
19 changed files:
- p/ghc/debian/changelog
- + p/ghc/debian/patches/0005-Pass-the-mcmodel-medium-parameter-to-CC-via-GHC.patch
- p/ghc/debian/patches/series
- p/haskell-clash-ghc/debian/changelog
- p/haskell-clash-ghc/debian/rules
- p/haskell-isocline/debian/changelog
- p/haskell-isocline/debian/rules
- p/haskell-lua/debian/changelog
- p/haskell-lua/debian/rules
- p/haskell-pandoc-lua-engine/debian/changelog
- p/haskell-pandoc-lua-engine/debian/rules
- p/haskell-pandoc/debian/changelog
- p/haskell-pandoc/debian/rules
- p/haskell-primitive/debian/changelog
- p/haskell-primitive/debian/rules
- p/haskell-splitmix/debian/changelog
- p/haskell-splitmix/debian/rules
- p/haskell-zlib/debian/changelog
- p/haskell-zlib/debian/rules
Changes:
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+ghc (9.6.6-5) UNRELEASED; urgency=medium
+
+ [ fanpeng <fanpeng at loongson.cn> ]
+ * Pass the mcmodel=medium parameter to CC via GHC
+ (Closes: #1101273)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:42:14 +0100
+
ghc (9.6.6-4) unstable; urgency=medium
[ John Paul Adrian Glaubitz ]
=====================================
p/ghc/debian/patches/0005-Pass-the-mcmodel-medium-parameter-to-CC-via-GHC.patch
=====================================
@@ -0,0 +1,35 @@
+Origin: https://github.com/ghc/ghc/commit/1a3f11314cc7b8dbf9af03dd2ae2cb066a998d63
+From 1a3f11314cc7b8dbf9af03dd2ae2cb066a998d63 Mon Sep 17 00:00:00 2001
+From: Peng Fan <fanpeng at loongson.cn>
+Date: Thu, 13 Mar 2025 02:45:13 +0000
+Subject: [PATCH] Pass the mcmodel=medium parameter to CC via GHC
+
+Ensure that GHC-driver builds default to mcmodel=medium, so that GHC
+passes this default parameter to CC without having to add it to the
+compiled project.
+
+Commit e70d41406b5d5638b42c4d8222cd03e76bbfeb86 does not ensure that all
+GHC-built object files have a default model of medium, and will raise an
+R_LARCH_B26 overflow error.
+---
+ m4/fptools_set_c_ld_flags.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4/fptools_set_c_ld_flags.m4 b/m4/fptools_set_c_ld_flags.m4
+index 13913709c9..0fc4b0198b 100644
+--- a/m4/fptools_set_c_ld_flags.m4
++++ b/m4/fptools_set_c_ld_flags.m4
+@@ -93,6 +93,10 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
+ $5="$$5 -D_THREAD_SAFE"
+ ;;
+
++ loongarch64*linux*)
++ $2="$$2 -mcmodel=medium"
++ ;;
++
+ esac
+
+ AC_MSG_RESULT([done])
+--
+2.49.0
+
=====================================
p/ghc/debian/patches/series
=====================================
@@ -32,3 +32,4 @@ alpha-fix-ieee_set_fp_control-invocation.patch
0002-llvmGen-Allow-LlvmLits-in-MetaExprs.patch
0003-llvmGen-Introduce-infrastructure-for-module-flag-metadata.patch
0004-llvmGen-Pass-mcmodel-medium-option-to-LLVM-backend-on-LoongArch.patch
+0005-Pass-the-mcmodel-medium-parameter-to-CC-via-GHC.patch
=====================================
p/haskell-clash-ghc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-clash-ghc (1.8.1-5) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:44:56 +0100
+
haskell-clash-ghc (1.8.1-4) unstable; urgency=medium
* Team upload.
=====================================
p/haskell-clash-ghc/debian/rules
=====================================
@@ -5,10 +5,6 @@ DEB_SETUP_BIN_NAME = debian/hlibrary.setup
DEB_CABAL_PACKAGE = clash-ghc
DEB_DEFAULT_COMPILER = ghc
-ifneq (,$(filter $(DEB_BUILD_ARCH),loong64))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-isocline/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-isocline (1.0.9-4) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:45:35 +0100
+
haskell-isocline (1.0.9-3) unstable; urgency=medium
[ Peng Fan <fanpeng at loongson.cn> ]
=====================================
p/haskell-isocline/debian/rules
=====================================
@@ -5,9 +5,5 @@ DEB_SETUP_BIN_NAME = debian/hlibrary.setup
DEB_CABAL_PACKAGE = isocline
DEB_DEFAULT_COMPILER = ghc
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), loong64))
- DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-lua/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-lua (2.3.3+ds1-2) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:45:50 +0100
+
haskell-lua (2.3.3+ds1-1) unstable; urgency=medium
[ Peng Fan <fanpeng at loongson.cn> ]
=====================================
p/haskell-lua/debian/rules
=====================================
@@ -3,9 +3,5 @@
DEB_ENABLE_TESTS = yes
DEB_SETUP_GHC_CONFIGURE_ARGS += --flags="system-lua pkg-config"
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), loong64))
- DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-pandoc-lua-engine/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-pandoc-lua-engine (0.2.1.2-2) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:46:04 +0100
+
haskell-pandoc-lua-engine (0.2.1.2-1) unstable; urgency=medium
[ zhangdandan <zhangdandan at loongson.cn> ]
=====================================
p/haskell-pandoc-lua-engine/debian/rules
=====================================
@@ -4,7 +4,3 @@ DEB_ENABLE_TESTS = yes
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
-
-ifneq (,$(filter $(DEB_BUILD_ARCH),loong64))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
=====================================
p/haskell-pandoc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-pandoc (3.1.11.1-4) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:46:16 +0100
+
haskell-pandoc (3.1.11.1-3) unstable; urgency=medium
* Fix tests to work with new commonmark-pandoc
=====================================
p/haskell-pandoc/debian/rules
=====================================
@@ -2,10 +2,6 @@
DEB_ENABLE_TESTS = yes
-ifneq (,$(filter $(DEB_BUILD_ARCH),loong64))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-primitive/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-primitive (0.8.0.0-3) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:46:29 +0100
+
haskell-primitive (0.8.0.0-2) unstable; urgency=medium
[ Peng Fan <fanpeng at loongson.cn> ]
=====================================
p/haskell-primitive/debian/rules
=====================================
@@ -1,8 +1,4 @@
#!/usr/bin/make -f
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), loong64))
- DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-splitmix/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-splitmix (0.1.0.5-3) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:46:41 +0100
+
haskell-splitmix (0.1.0.5-2) unstable; urgency=medium
[ Peng Fan <fanpeng at loongson.cn> ]
=====================================
p/haskell-splitmix/debian/rules
=====================================
@@ -5,9 +5,5 @@ DEB_SETUP_BIN_NAME = debian/hlibrary.setup
DEB_CABAL_PACKAGE = splitmix
DEB_DEFAULT_COMPILER = ghc
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), loong64))
- DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-zlib/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-zlib (0.6.3.0-4) UNRELEASED; urgency=medium
+
+ * Drop mcmodel hack on loong64, now that ghc automatically
+ passes it
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 25 Mar 2025 10:46:53 +0100
+
haskell-zlib (0.6.3.0-3) unstable; urgency=medium
[ zhangdandan <zhangdandan at loongson.cn> ]
=====================================
p/haskell-zlib/debian/rules
=====================================
@@ -4,7 +4,3 @@ DEB_BUILD_DEPENDENCIES = build-arch
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
-
-ifneq (,$(filter $(DEB_BUILD_ARCH),loong64))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --ghc-options="-optc-mcmodel=medium"
-endif
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/9eede45df9ccb2da46ecc965ed5d34bb89d22bfd...f45cfe875f67fba7100c0e5caada23fdc745d253
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/9eede45df9ccb2da46ecc965ed5d34bb89d22bfd...f45cfe875f67fba7100c0e5caada23fdc745d253
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/20250325/2e7a711a/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list