Grab some fixes from upstream for ia64 #425736 by Tim Yamin.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 164 insertions, 19 deletions

diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index f7d7ef8885c3..71ae1f5018c6 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libunwind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.19 2012/05/31 20:38:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.20 2012/07/23 03:38:26 vapier Exp $
+
+  23 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/libunwind-1.0.1-ia64.patch, libunwind-1.0.1-r1.ebuild:
+  Grab some fixes from upstream for ia64 #425736 by Tim Yamin.
 
   31 May 2012; Samuli Suominen <ssuominen@gentoo.org> -libunwind-0.99.ebuild,
   -libunwind-1.0.ebuild, -files/libunwind-1.0-disable-setjmp.patch:
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 8756c8e58ff2..15935ef9b24f 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,24 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libunwind-0.99-disable-setjmp.patch 8566 RMD160 56d373ca810a237388f6a7c156a64cc223899a8b SHA1 619744fbc19ac0fac93059e21fb6647f03dc2b7d SHA256 d9cce99c7e53414b7c364c1e1fd14332bc9d2decae26750244af166d6fb820ef
-AUX libunwind-0.99-implicit-declaration.patch 486 RMD160 0e1e3d5f4665bcf3ac049ded1928b17c8ae7f2df SHA1 3bd36046e74524f009dcda5b96ad298262d9ad65 SHA256 f8f72c6160c6741ea2a3d251662fe3d8ecd63bfcf488527838e6d95e4dddd2a1
-AUX libunwind-1.0.1-disable-setjmp.patch 1236 RMD160 608bef9f826ea14364ac2ca1fa049912f6203a3b SHA1 ad0c1eb71a41317fe03b6ff1df538d1f15364593 SHA256 71e44f436674ad2b8459cda517b924ae85241df53c974eb0951a81614d179945
-DIST libunwind-0.99.tar.gz 711817 RMD160 d51876e9db75c5d456a3a2a4651f027a0a0e8930 SHA1 2969f68f27b2ede08ae129178a9b393f92be73d2 SHA256 56083aae17eab3ccb7a36b95f0430f5a5f258755bf193bb5ca4fd4b918356164
-DIST libunwind-1.0.1.tar.gz 1028725 RMD160 74dce5579263f0bdd45b1e483ffc87ec78f42c69 SHA1 bd849c15bce57844d8bd086439bbd4bc736e7d97 SHA256 aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f
-EBUILD libunwind-0.99-r1.ebuild 1103 RMD160 10794096a1d3845f840c00193aa4feed9e513c45 SHA1 09d8fed2f946f7c03b821d9eb3bd3d53e7cf468f SHA256 962c93f91523135b31c45f726accc1f2d87f2b5877d5fcefa2790861d84bef2f
-EBUILD libunwind-1.0.1-r1.ebuild 1881 RMD160 dc915ae75695a55606320b72d06019adfd306bbb SHA1 35c7e8bb60cded339ea8d6ae1ba709e8dcf77f93 SHA256 f920aa04a954a798b66c52279ca6a32884a8817414079212592163d559e577c6
-EBUILD libunwind-1.0.1.ebuild 1407 RMD160 cd361ff319f066445f41bd4e9b880600a12982fd SHA1 39f85bdcae752772069d5c93976a7ac790b73845 SHA256 f23c9405452a13e7238b55bbaff71c7636ef47605a618d3eac55914410ff7036
-MISC ChangeLog 3073 RMD160 d86cc163c853b3ad976df04a1a68f4ba18471889 SHA1 1652a6d334ee50248a73ea17045352b7f09234b1 SHA256 6b8e909bb8f0f11352e1ba3da81cb0d930ef28164d61cc1ead1e49cbb7ea1cd1
-MISC metadata.xml 308 RMD160 3c6551823e01efd2cc1e2aabd25a140643f51984 SHA1 87ffb4f4cb97cc35465ec54f49a69be0e0a1ac01 SHA256 7cc6384c4b235b1f508c714d3a35a8944cb7a550d93132d1bc328c936364c461
+AUX libunwind-0.99-disable-setjmp.patch 8566 SHA256 d9cce99c7e53414b7c364c1e1fd14332bc9d2decae26750244af166d6fb820ef SHA512 c14ecaf9730f753787dbabe19194f92b55fde43c9310839adbc642500ba72a8e76e0509931bcf08db73cb8d73f131b7f6c7e255ca91543ddb3bb21531830c85f WHIRLPOOL 6ff8ff18e2f62a235cb201a2f4fd15cace61fcc23f36a823bf4e113c4dccbb27d39419d09ff22dc76f8ee6e46a9d552d4782c2f3a41b2f8ab3f031b82dd265ac
+AUX libunwind-0.99-implicit-declaration.patch 486 SHA256 f8f72c6160c6741ea2a3d251662fe3d8ecd63bfcf488527838e6d95e4dddd2a1 SHA512 071a59b3e9c46a045ce686abe5f6a70e6f007bbc3b2aaeeccdc900186346e44193ccee1ac63ddb5d37b7c9c161228f4d45de0d7b43d1ccab23f579496aa8ef90 WHIRLPOOL 08fd3bf9f83f7ff35edab20d4693634cf510cfa3c8cf50fa210510815c8b6129630ac04bb9e7640c042f837ca22f6ea7b9638d88f78722e8a6b60842306437f8
+AUX libunwind-1.0.1-disable-setjmp.patch 1236 SHA256 71e44f436674ad2b8459cda517b924ae85241df53c974eb0951a81614d179945 SHA512 33c9fb45cec2b3ea6d37abcf483af27b2dbf839c2986cf688809d235d6f49ace4666b05fb856a5aaa85856a71ed95df737b0c4dbd451ebf1f6a18e39b376e053 WHIRLPOOL 100a629730eb87412a71bcce57c07f2c01c191782c988be853ae0272f9f7120cbd8440a094253575895afedf1c92ec69d3c1bd5e830b5f02e278a4eacc0f7b14
+AUX libunwind-1.0.1-ia64.patch 5118 SHA256 d5de421a421a35e4efd4f7787d54095aebc310e205c5a412624b73db46530d82 SHA512 2a703cce762080b4581acccfc19a003b81d3a4ba7da4f620af41fc043590367359e16e5f16c95a399f347da61d2386d246d86d03ba195b022520cb326cc27dfe WHIRLPOOL aec72622f42083af788f87ac3130afec36a91eb82591b4df554ab3232a709938b557fd51e1c4e84540198f97ff6a25cf7905a3c728b9c5249f8b16753496b84e
+DIST libunwind-0.99.tar.gz 711817 SHA256 56083aae17eab3ccb7a36b95f0430f5a5f258755bf193bb5ca4fd4b918356164
+DIST libunwind-1.0.1.tar.gz 1028725 SHA256 aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f SHA512 e360f0c0abf1e8b153a01cf522237495cecd9b4c689fa55868e60cec86f650e86ceefa283c045fa3d4bd50dc130e75ce7a8ad221c8f938c20a56f106aa3de8c5 WHIRLPOOL 0a2bcfdabb97cb541f7050203db4b658d0b853fdeb504e5917a731547a673e78db9ea0a64ee17ffc137017fc474c7ba44086fdbf2f5f3519993b5bd0048c76b4
+EBUILD libunwind-0.99-r1.ebuild 1103 SHA256 962c93f91523135b31c45f726accc1f2d87f2b5877d5fcefa2790861d84bef2f SHA512 e8a335060b4955034ebade25644f171af878960f869742585fbef5a65ed48657d7eaaa7172ea1ab322efe9009135716fe0d34d5a67905f9ed8863fe85cdde3eb WHIRLPOOL 0e0b318c5f9db6252224ac56980141d9512d326d1c18672210a5f4d1e0b71638e3d70c54ffc548a09a2363d09ad6db8ba1861cf116d77e41dfe1d1ddfee25166
+EBUILD libunwind-1.0.1-r1.ebuild 1931 SHA256 46ef66d0d66010da833c2cebe60df66dd4b25a12647aca3ee68b939d29148bbc SHA512 3555ad9bdcfedc694258b49f41369be6458a5d522fab4cda51696b126b66be4d8c63bae20682e8de1d52bfcb49392bba26746be9bb29496833f23a1873baecc5 WHIRLPOOL 7232fb952badf3d7734be4c4782f59dd88ff93b51045fb7441765f967f3932c7ec99e0b52a78e57ce3035e6ae12aa6e3acb1cbdd8f20d3d782fc660ffd402a35
+EBUILD libunwind-1.0.1.ebuild 1407 SHA256 f23c9405452a13e7238b55bbaff71c7636ef47605a618d3eac55914410ff7036 SHA512 dc01f58db7fd25f14e3075090e000e22c83ce192069880bd36a72d66af16da0865e22b9d15a2329e6a1eecaeeb5474810bbdc1dcc574779c5f5dc09414963630 WHIRLPOOL 9e5cef0cda05c72b20cc5b8d066d2b669c58a8c983e448670c4434a96ac596f77b6e2ec68d61f837de650e6e2b84d916272a1ea63b33fe4e622515a0af63bbfd
+MISC ChangeLog 3248 SHA256 161373657b7bb8d9ead3b460a8eb8d2a233cceb947047392459417643ebf51ad SHA512 46014216ebb637690e37b9297081e428e491af8cca79459aeb739ca172228859f1acd4621e2d8572aaa8007a3c82e76f469fc1dc3087d187c25f1f62b1adf5e3 WHIRLPOOL 2205d87b1c0bcbf916dcbe612a2e47c3e6e474e63810063080d5708422b1f86e5df3816b4eb5450d10c8641704f06217a2165c9399819df7c26e9cee7b96e647
+MISC metadata.xml 308 SHA256 7cc6384c4b235b1f508c714d3a35a8944cb7a550d93132d1bc328c936364c461 SHA512 777fe5edcaaf2fb8d860fcb6e4c11b85b701ae11963d89bdc6210abcce609bb9c41936b2d658c67a56e99001e2822753f71593c5ad4f513c8518d88149dd4b59 WHIRLPOOL 68b6c100b70f5acd52f64a7d10d79784de1f6c93872216239d6df5b9d735ccc35252b8e5d3148cd1ce9c466962acfab36743083440cd8cc27737dc7a712cf756
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPx9YxAAoJEEdUh39IaPFN6QMH/0rn5oyY3btQV7pV3bXWjo9R
-G5ZdFHZOXerepeFFyWDWrFSVP6jl5/By76tuBAc8qUCQ6Z7I7cagDU+fi5QpDnHz
-zRa/Ib7B8y5z120osQKCjGR1oKl2SKU4erQfEb1WCDznOVTFMixz580RuBngReLD
-L/Z2ZzFK2jRXhhFGlvCjJz+Uw79LE4fTyJa1OWSp5jKMW+o5Rw78E5DI5PQsJcf1
-ZVjbcWj72Nv8k13UuvC1pQznuu86gp0VnCnuKF0svT8LhtrCKpGqRqoBgFXaDsTF
-+GmWvlT2rtqmra8wricS2GR//LVOFBrisGkJTpjAJkbF9rWd5JPDqJRFF7eFIiE=
-=cdnX
+iQIcBAEBAgAGBQJQDMduAAoJELEHsLL7fEFW4xwP+gIvofesvjJu4BZZcyPwzY+p
+Ke+Kp6uWfmL2TW/IAoIthMYSaCEr2Wx8eGqYDt36OlH7JFsNcWNxjTEb/vXjwhJT
+e1GoEDDSB7CUEHoI/z+FXGNjGOdpmVo0vlgn5cCkjixGH2uDH4l+TbS5LTYrzK4u
+CaRdTx/t3wkTVH5hidjOFov0fXsT5XbYNAHKrOWwLr3+ng+VDcz9IsT1SiPQ8Pxw
+OTNAOo0iKHcxX89QSCsJnSx12+2B8lnaSNlGchZYuBKiYUQNYJx1x4yUjxIxtTeL
+27faVDNjAFNcSbj2AAH2rxVZBMlhdQATbLB+sBDePX4ThKxwACO/qlukQPXR3XCv
+ZXAz1Na6qrb5Gsv75o+diTQiHnk0r0oV0aBEVoDjR+6usPxQct6133ZJMiZHzLf4
+RD18MeyI01nAAA9xDyTn7F70sY5Dqp7mDp3IjWuMAZ7fYSM/4/7rXg3BuQRKPrPf
+L6Nir/CHazrV1JLD91ZsKlDTGX+3AUDij5hzkO9uU/bqm+3MRjZnLoLmfrLBHAQR
+J+TVwWKnOlcR0Wz3H/7qoEbIFpPjDKRWR2feHHu0R1+mdAjdeiPMCz+3e2Xc/WrE
+WmUEuR2tfF3WdxW01msaO+Zlx2bLZ44pq8oDtThAyJnZNH4qCfMSGp0entuYF4iL
+2nC5G+D1vmYdREy0Thc0
+=n7AP
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libunwind/files/libunwind-1.0.1-ia64.patch b/sys-libs/libunwind/files/libunwind-1.0.1-ia64.patch
new file mode 100644
index 000000000000..0639e64e8a91
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.0.1-ia64.patch
@@ -0,0 +1,133 @@
+fix from upstream for building on ia64
+
+https://bugs.gentoo.org/425736
+
+From 197571915c70b9ccd0978c13f12acb2a5f3058d4 Mon Sep 17 00:00:00 2001
+From: Ken Werner <ken.werner@linaro.org>
+Date: Tue, 11 Oct 2011 15:13:35 +0200
+Subject: [PATCH] Change _UPTi_find_unwind_table to return an integer.
+
+This keeps the definition on IA64 and all the other architectures in sync with
+the declaration of _UPTi_find_unwind_table. This also mimics the behaviour of
+what's done for local unwinding and allows the function to provide more than
+one way to undwind.
+
+Signed-off-by: Ken Werner <ken.werner@linaro.org>
+---
+ src/ptrace/_UPT_find_proc_info.c         |    8 ++++----
+ src/ptrace/_UPT_get_dyn_info_list_addr.c |    6 ++----
+ src/ptrace/_UPT_internal.h               |    2 +-
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/ptrace/_UPT_find_proc_info.c b/src/ptrace/_UPT_find_proc_info.c
+index 44feb34..7aaa0c2 100644
+--- a/src/ptrace/_UPT_find_proc_info.c
++++ b/src/ptrace/_UPT_find_proc_info.c
+@@ -95,7 +95,7 @@ find_gp (struct UPT_info *ui, Elf64_Phdr *pdyn, Elf64_Addr load_base)
+   return gp;
+ }
+ 
+-HIDDEN unw_dyn_info_t *
++HIDDEN int
+ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
+ 			 char *path, unw_word_t segbase, unw_word_t mapoff,
+ 			 unw_word_t ip)
+@@ -105,7 +105,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
+   int i;
+ 
+   if (!_Uelf64_valid_object (&ui->ei))
+-    return NULL;
++    return -UNW_ENOINFO;
+ 
+   ehdr = ui->ei.image;
+   phdr = (Elf64_Phdr *) ((char *) ui->ei.image + ehdr->e_phoff);
+@@ -132,7 +132,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
+ 	}
+     }
+   if (!ptxt || !punw)
+-    return NULL;
++    return 0;
+ 
+   ui->di_cache.start_ip = segbase;
+   ui->di_cache.end_ip = ui->di_cache.start_ip + ptxt->p_memsz;
+@@ -143,7 +143,7 @@ _UPTi_find_unwind_table (struct UPT_info *ui, unw_addr_space_t as,
+   ui->di_cache.u.ti.table_len = punw->p_memsz / sizeof (unw_word_t);
+   ui->di_cache.u.ti.table_data = (unw_word_t *)
+     ((char *) ui->ei.image + (punw->p_vaddr - ptxt->p_vaddr));
+-  return &ui->di_cache;
++  return 1;
+ }
+ 
+ #elif UNW_TARGET_X86 || UNW_TARGET_X86_64 || UNW_TARGET_HPPA \
+
+From 962366dace4fed902ad5e89df1b34c13c3224b8b Mon Sep 17 00:00:00 2001
+From: Arun Sharma <asharma@fb.com>
+Date: Fri, 23 Sep 2011 11:11:34 -0700
+Subject: [PATCH] Fixup compile errors on ia64.
+
+Suggested-by: Harald Servat <harald.servat@bsc.es>
+---
+ src/ptrace/_UPT_get_dyn_info_list_addr.c |    2 +-
+ src/ptrace/_UPT_internal.h               |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ptrace/_UPT_get_dyn_info_list_addr.c b/src/ptrace/_UPT_get_dyn_info_list_addr.c
+index d82d4e4..ba9c795 100644
+--- a/src/ptrace/_UPT_get_dyn_info_list_addr.c
++++ b/src/ptrace/_UPT_get_dyn_info_list_addr.c
+@@ -62,7 +62,7 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg,
+ 
+       Debug (16, "checking object %s\n", path);
+ 
+-      di = _UPTi_find_unwind_table (ui, as, path, lo, off);
++      di = _UPTi_find_unwind_table (ui, as, path, lo, off, 0);
+       if (di)
+ 	{
+ 	  res = _Uia64_find_dyn_list (as, di, arg);
+From d93d96ad833390519ea68a2df22dd55dd26a3214 Mon Sep 17 00:00:00 2001
+From: Martin Milata <mmilata@redhat.com>
+Date: Tue, 22 May 2012 11:51:06 +0200
+Subject: [PATCH] Fix compilation on IA64
+
+ - Add tdep macro for {dwarf,ia64}_find_unwind_table so that ia64
+   doesn't try to use dwarf code.
+ - Fix extraneous #if.
+ - Fix mistyped filename in Makefile.am.
+ - Link ia64-specific tests with correct libraries.
+
+Signed-off-by: Martin Milata <mmilata@redhat.com>
+---
+ include/tdep-arm/libunwind_i.h           |    1 +
+ include/tdep-hppa/libunwind_i.h          |    1 +
+ include/tdep-ia64/libunwind_i.h          |    1 +
+ include/tdep-mips/libunwind_i.h          |    1 +
+ include/tdep-ppc32/libunwind_i.h         |    1 +
+ include/tdep-ppc64/libunwind_i.h         |    1 +
+ include/tdep-x86/libunwind_i.h           |    1 +
+ include/tdep-x86_64/libunwind_i.h        |    1 +
+ src/Makefile.am                          |    4 ++--
+ src/ia64/Gfind_unwind_table.c            |    3 ---
+ src/ptrace/_UPT_find_proc_info.c         |    2 +-
+ src/ptrace/_UPT_get_dyn_info_list_addr.c |    2 +-
+ tests/Makefile.am                        |   11 +++++++++++
+ 13 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 26e7987..4b3bce3 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -165,3 +165,14 @@ test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+ test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+ ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+ 
++
++Gia64_test_nat_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
++Gia64_test_stack_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
++Gia64_test_rbs_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
++Gia64_test_readonly_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
++Lia64_test_nat_LDADD = $(LIBUNWIND_local)
++Lia64_test_stack_LDADD = $(LIBUNWIND_local)
++Lia64_test_rbs_LDADD = $(LIBUNWIND_local)
++Lia64_test_readonly_LDADD = $(LIBUNWIND_local)
++ia64_test_dyn1_LDADD = $(LIBUNWIND)
++ia64_test_sig_LDADD = $(LIBUNWIND)
diff --git a/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild
index f543f09a1b19..7228a6398ac6 100644
--- a/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild,v 1.1 2012/05/31 20:35:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.0.1-r1.ebuild,v 1.2 2012/07/23 03:38:26 vapier Exp $
 
 EAPI="4"
 
@@ -25,6 +25,7 @@ QA_DT_NEEDED_x86_fbsd="usr/lib/libunwind.so.7.0.0"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.1-disable-setjmp.patch
+	epatch "${FILESDIR}"/${PN}-1.0.1-ia64.patch #425736
 	eautoreconf
 }