summaryrefslogtreecommitdiff
path: root/p/ghc
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2015-05-25 20:29:32 +0300
committerJoachim Breitner <mail@joachim-breitner.de>2015-05-25 20:29:32 +0300
commit225b933cb8f2ca6973f96114a84673027f46a800 (patch)
tree9f449217f16368169500d0a5b6edf9ef193704ef /p/ghc
parent7f1ee3714f09d96785c9438b00352eeb921331da (diff)
downloadDHG_packages-225b933cb8f2ca6973f96114a84673027f46a800.tar.gz
ghc: debian/patches/stable-specialization-rule-names: Root out another cause or binary ABI instability.
Diffstat (limited to 'p/ghc')
-rw-r--r--p/ghc/debian/changelog7
-rw-r--r--p/ghc/debian/patches/series1
-rw-r--r--p/ghc/debian/patches/stable-specialization-rule-names18
3 files changed, 26 insertions, 0 deletions
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 1ebc03b61..71e5f285c 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,10 @@
+ghc (7.8.4-8) UNRELEASED; urgency=medium
+
+ * debian/patches/stable-specialization-rule-names: Root out another cause of
+ binary ABI instability.
+
+ -- Joachim Breitner <nomeata@debian.org> Mon, 25 May 2015 19:28:23 +0200
+
ghc (7.8.4-7) unstable; urgency=medium
* Remove useless *.haddock.t files (upstream bug 10410)
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 35d2a44c3..a2ca4da4b 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -11,3 +11,4 @@ ghc-7.8.4-3-aarch64.patch
PPC-relocations.patch
buildpath-abi-stability.patch
reproducible-tmp-names
+stable-specialization-rule-names
diff --git a/p/ghc/debian/patches/stable-specialization-rule-names b/p/ghc/debian/patches/stable-specialization-rule-names
new file mode 100644
index 000000000..444b0b780
--- /dev/null
+++ b/p/ghc/debian/patches/stable-specialization-rule-names
@@ -0,0 +1,18 @@
+Another possible reasons for non-stable ABI hashes: names of SPEC rules. This is a backport of
+https://git.haskell.org/ghc.git/commitdiff/a477e8118137b7483d0a7680c1fd337a007a023b
+which is contained in 7.10.1.
+
+
+Index: ghc-7.8.4/compiler/specialise/Specialise.lhs
+===================================================================
+--- ghc-7.8.4.orig/compiler/specialise/Specialise.lhs 2014-04-07 20:26:08.000000000 +0200
++++ ghc-7.8.4/compiler/specialise/Specialise.lhs 2015-05-25 19:26:53.276640698 +0200
+@@ -1148,7 +1148,7 @@
+ ; let
+ -- The rule to put in the function's specialisation is:
+ -- forall b, d1',d2'. f t1 b t3 d1' d2' = f1 b
+- rule_name = mkFastString ("SPEC " ++ showSDocDump dflags (ppr fn <+> ppr spec_ty_args))
++ rule_name = mkFastString ("SPEC " ++ showSDocForUser dflags neverQualify (ppr fn <+> ppr spec_ty_args))
+ spec_env_rule = mkRule True {- Auto generated -} is_local
+ rule_name
+ inl_act -- Note [Auto-specialisation and RULES]