Fix threaded runtime on ia64 (sm_mutex import).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 80 insertions, 7 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 66f60e00c328..ad4233c4a33c 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.274 2015/01/13 22:10:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.275 2015/01/17 14:44:56 slyfox Exp $
+
+  17 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/ghc-7.8.4-ia64-CLOSUREs.patch, ghc-7.8.4.ebuild:
+  Fix threaded runtime on ia64 (sm_mutex import).
 
   13 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org>
   +files/ghc-7.8.4-gold.patch, ghc-7.8.4.ebuild:
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index cdbf6c856f39..1231ccac7acb 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -24,6 +24,7 @@ AUX ghc-7.8.3-ppc32-fPIC.patch 14549 SHA256 413638aeec8e7cf35495f163e584d459870e
 AUX ghc-7.8.3-prim-lm.patch 444 SHA256 c147880c5c9f784cd731749589009a777317bd32b80b63f508730854025fcb7e SHA512 6979e002589a54c870c70eee8357dad4feb55b4e5102350cc09a466145677dacaa1bab5ebe4818cf0d3cd8ab50ee0ec2ab642ab0fb3fd34f4a266e5e90f9f389 WHIRLPOOL e33b43f42fa5e408d7879822c5081c89688cb924fadea32bb3c7ba426661c6b345e2051aac29e5f73ec2c7eafd63ae87413b4d52228e7e345308f5f816e1117a
 AUX ghc-7.8.3-unreg-lit.patch 3248 SHA256 dd7dc819e0211f936c8bc450adb90c433ca7e37596898c97698c93dae7c4011a SHA512 c16361d3bf04839106221e18f9b1d861cf52da8091276fd4e6347f24e0707093b94e4d384bd452e1d7ef772392b8ce0103e42d68d91ec583f26250bb9af2be9e WHIRLPOOL 94194d10dd6b5ca9d624071bc455a1d76b4323f2cbc229bcb4cc9f41089903d7405cfa2e1000bb24b5828bcd5bdf1a44defe5c95a26e8d470c899906f2be0784
 AUX ghc-7.8.4-gold.patch 1025 SHA256 632b044022c6ec60038164274250a34a3aaee9bd419e6f53ffe17d22ac145f06 SHA512 3087084d8b6a202496fc7ac71fadde06f7d1622d0e3f44f1b52fd04f1451d690f54b6bd8ee0da85663d252c6110340402bd1864f746117e59ce7b02e0247ec94 WHIRLPOOL 725031bcfaadd54b426600915ca4ef7a8815b6882ba0c723acf3a93c3a804282ea30c188954b4c4e1d869f4b9769f79b0db19718946279b256fc8ef5ecaf33db
+AUX ghc-7.8.4-ia64-CLOSUREs.patch 2243 SHA256 557841c6a05d7148235aa2290d19e0e7927de2451182dce04a7a83493eb8ac27 SHA512 9981d13f294fe0a28d1cabfd4db98bfb18110c6adb390f509667e3166a931c7d9f7b4b0079dfb1a22c174556944fef62f0e67ec855a9c3bccc5b54b0d0952c09 WHIRLPOOL c8d8f52e9c063106cb972e402966be8095c7a2761126cdc7dfe5e2584ab5d3e5fa11fae64db7b15fabdbd161123f1db4d5477f5653557ba22273cfce8da2ba3b
 AUX ghc-bash-completion 6496 SHA256 82a862bea2c9248e06fcf74d307de07b05a55f9eb95f412762bd02e53fece822 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5 WHIRLPOOL 271dc4159ac500beb53981259e4b154b1f96e2909bb7cc43b7364f4fd4f86ce65df04611a46043c14079f699226195a002532fbb1e4ec01715e07e8469f9a7a4
 AUX terminfo-0.3.2.5-tinfo.patch 1217 SHA256 dfbb8d5c9ca133837e6f6be766fa8e3af2715e39d8994e56a4a84d6cdc15f9b3 SHA512 60552b163295c565d506b1d3c9624d6d0e94e814c37bb38d0cf0911e153c593c2bd13418306b44fbe611b7fd9064307a201860ed1e2ce5f2a7bb16618bd0b615 WHIRLPOOL 2c06869486a8eb08ff63f7bacebfddfdf68cf0c0dd94ef3578c5dbc49b4374b2ba8c0de9ac2ed4731a3ad27466a4169d2bd13d1c208a8d0aa1226770bcb30847
 DIST ghc-7.4.2-src.tar.bz2 25836446 SHA256 f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d SHA512 5a3d06a36702fa7e337b482c9de92ce1f84a68f18d8560bcc11f3617d6d46f93167fee27e786de6483a9ef0eab3b1ac6909a71dd53908d36156df4e465075050 WHIRLPOOL 61865eed2bf92728e7c4c4a0c48be44081bf728cfd824760d643e2fad838d96c19e173052d3aac073e0795b5efa3720ba5ddf13cca1ec7952b7524bbe1f204bc
@@ -55,13 +56,13 @@ DIST ghc-bin-7.8.4-x86.tbz2 102312459 SHA256 4c53148836e5a1ba55b8db5bb7c3eb91510
 EBUILD ghc-7.4.2.ebuild 22109 SHA256 c061678ca7fb3e578856ed5e5ccd72b9e1cf86000889d41b64bf51dcfcdaad3c SHA512 9fa1ac3968cb2e9cc231d2fdaf0fee54b1070c925a86f5fc257858a3bab9eb1b684893a405d4f7fbbc0a6771fa06b7d572e790368f8093e23abed176cefaa43a WHIRLPOOL 813f4113c4dd73bfd0591d48f426a6451b1662458e75ea6b3f748a8d64fec354273cc15f8db218e03965338e87e0b00ffc424dd7defc77a5424ef8651fa29038
 EBUILD ghc-7.6.3-r1.ebuild 29019 SHA256 343248f0572b248bf68911c17c0be7b191831a32372c3fb8790d4058a0069ecd SHA512 185f14b1bbe37caf75544784dbea9859b5d539202b31a2f1c48775be7ee7ddd6dd5af0f6a647ff22dfac95c4d590243f4a3b66f5153438e31f472f7db3041759 WHIRLPOOL bca4e0dd6122a6e05973153119ce3d1db6a97ada0b8d0718638d6446eca7dec322bf954d86605b34ab76b5e0496bdae98ff88694e789476e7de6b78ef2def205
 EBUILD ghc-7.8.3.ebuild 20720 SHA256 9887614b5a6bc0df0bb5a3899344caf7c5555673cb6c080fe58749afe9c65985 SHA512 267750389414cd573a876d2fd6af57c2deea63d05d004bfe1d42cd98af73fc69cbd660e4ceb726b1eba223c99ad784aa2c9b1bb4ab9407f3f9640e36fd5ff7f5 WHIRLPOOL 4c24a143522443adb7c664671ee7d65b92dd28e9aedc444422eb1e23598b167c4b0ebd8ac8f6e4cd3b7cb130a6dab271838be1cc311e5ff95c3164d8a691af6e
-EBUILD ghc-7.8.4.ebuild 20629 SHA256 8f44ba788a3665ab189f883cdfa46697c227ba8c063cca30c5b0ea0d9e3bb10d SHA512 5e2a6c0f51b670bb9d5cc77d47b012e275500aaa7464fb340bf1a771df747157dbf74b7fc3fce1b8a0db3f2c2e50a5cc43b0ce4bdd3c3fa00e999fad571f472e WHIRLPOOL 8b8500a4cbc26234a5bc4584c453ef804f3e1c3dd8a0f8de606133e4d007febd7ef6b3f2f1218ca3b9a99167151648d6c97cf39f31d53f881b6b36b35d69b315
-MISC ChangeLog 51628 SHA256 7d510c116b17118b0ecad9393d644c408af0122e4c9e85c172fba8e85d3a16d1 SHA512 39c16b16dafbdd40636fc4350d369756a856f98dc1310d05c625938c04b50affae3cff7333f29d3d5320bd20b522b93147f13bfa92364bf6ee50d0e444873cb1 WHIRLPOOL bc32d06358fd2875c653ce0fbbeba08721cebbf3072b70af5219cff330ad481171e7062654fbaee0faedd0f093aa0f7e7e29964c0df006e8ff03f1a49a022a3b
+EBUILD ghc-7.8.4.ebuild 20717 SHA256 3f3f4dcb80d27d7d05a1b38e43d32b4af926f9558c56391d7d0d90799f57120a SHA512 069647c31dec6adc05ea29daec735d5ba61e0ad835562ca0379c0475a6c231d52550451018a2c84f73290cb893a2a68b58259b56591c2c7c2f1bd7e3615e7274 WHIRLPOOL 542c994b167125be6bc072e7ca141ecb0590e012b29f705ea407a6546335530a72baba0ee03907b18d6b6bf7a385d74b0217e0a9a63fb9af6e6704db30b5cf6a
+MISC ChangeLog 51791 SHA256 bbadf8aff71cc1bd3a39c35f1be70375ef72119a0935d274cbee2911fe705dee SHA512 d69de0dfe11b556668a9fed9c3d84fc1f44c26a2a51435b749b81dea95856589590f587e7ab54b06449d7d6439199fd1ea9db192e3816dc26f51f101d8344198 WHIRLPOOL 4bc33a89be3e5393faa6effaf43c43c353504193a1975771a51cf5fc413f86e1def404309948433ad66fa1762a757312567b326ce637af6ba41d5e9963b4d6d5
 MISC metadata.xml 561 SHA256 f964cd5b31b8a5e1979c03ced645f9e28b61528b456340e36cacef4b25104735 SHA512 50ef5db553f7ae99de80ef2f45d2c6c9c3b85bc4ef70ef7f79797a3c47f33a8ca9c9caf14752f38b81f0abd17df594820bc2161a10c7d177c126fcb101b24c31 WHIRLPOOL 1d4e744e284d0053a8cff1547dd25c4f0f2dcb8da35dee4523dbadcc9e29a92beb6ce7e63044c09995ffb255d39c5f02d901b330c481763b608ba4ed6e243faf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS1l/YACgkQcaHudmEf86otNgCeN/SP/45Pkj33kniHPlthn50N
-a/8An3joQoi2oWpW+92USp6I12M8E9NF
-=s1Gz
+iEYEAREIAAYFAlS6dWoACgkQcaHudmEf86p7vwCfRx8573zddWZ5MFKXop5xTv5G
+F9wAn1oGWahMoVNTVtxxRWRkUiiFgt6N
+=Rvbk
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch b/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch
new file mode 100644
index 000000000000..9d50792bcf45
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch
@@ -0,0 +1,66 @@
+From b677ba51cf8131a6f6ddcdfee8dd2a8c4c2b4ac7 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Sat, 17 Jan 2015 14:27:13 +0000
+Subject: [PATCH 1/3] CMM: add a mechanism to import C data labels
+
+Fixes threaded runtime on ia64.
+sm_mutex there was not referenced correctly.
+
+Signed-off-by: Sergei Trofimovich <siarheit@google.com>
+---
+ compiler/cmm/CmmParse.y | 4 ++++
+ rts/Exception.cmm       | 2 +-
+ rts/PrimOps.cmm         | 6 +++---
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/compiler/cmm/CmmParse.y.source b/compiler/cmm/CmmParse.y.source
+index 6b51e51..fd9489b 100644
+--- a/compiler/cmm/CmmParse.y.source
++++ b/compiler/cmm/CmmParse.y.source
+@@ -575,6 +575,10 @@ importName
+         : NAME  
+         { ($1, mkForeignLabel $1 Nothing ForeignLabelInExternalPackage IsFunction) }
+ 
++        -- as previous 'NAME', but 'IsData'
++        | 'CLOSURE' NAME
++        { ($2, mkForeignLabel $2 Nothing ForeignLabelInExternalPackage IsData) }
++
+         -- A label imported with an explicit packageId.
+         | STRING NAME
+         { ($2, mkCmmCodeLabel (fsToPackageKey (mkFastString $1)) $2) }
+diff --git a/rts/Exception.cmm b/rts/Exception.cmm
+index 5007ef3..8d19c14 100644
+--- a/rts/Exception.cmm
++++ b/rts/Exception.cmm
+@@ -13,7 +13,7 @@
+ #include "Cmm.h"
+ #include "RaiseAsync.h"
+ 
+-import ghczmprim_GHCziTypes_True_closure;
++import CLOSURE ghczmprim_GHCziTypes_True_closure;
+ 
+ /* -----------------------------------------------------------------------------
+    Exception Primitives
+diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
+index 3e8612c..2e6ca46 100644
+--- a/rts/PrimOps.cmm
++++ b/rts/PrimOps.cmm
+@@ -28,12 +28,12 @@
+ import pthread_mutex_lock;
+ import pthread_mutex_unlock;
+ #endif
+-import base_ControlziExceptionziBase_nestedAtomically_closure;
++import CLOSURE base_ControlziExceptionziBase_nestedAtomically_closure;
+ import EnterCriticalSection;
+ import LeaveCriticalSection;
+-import ghczmprim_GHCziTypes_False_closure;
++import CLOSURE ghczmprim_GHCziTypes_False_closure;
+ #if defined(USE_MINIINTERPRETER) || !defined(mingw32_HOST_OS)
+-import sm_mutex;
++import CLOSURE sm_mutex;
+ #endif
+ 
+ /*-----------------------------------------------------------------------------
+-- 
+2.2.1
+
diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
index 46b65995e5ef..7a385ea92f48 100644
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.5 2015/01/13 22:10:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.4.ebuild,v 1.6 2015/01/17 14:44:56 slyfox Exp $
 
 EAPI=5
 
@@ -400,6 +400,8 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
 		# bug 518734
 		epatch "${FILESDIR}"/${PN}-7.6.3-preserve-inplace-xattr.patch
+		# fix threaded runtime on ia64
+		epatch "${FILESDIR}"/${PN}-7.8.4-ia64-CLOSUREs.patch
 
 		# upstream backports
 		epatch "${FILESDIR}"/${PN}-7.8.3-linker-warn.patch