Add virtual/awk dependency, fix build failures on x86 (bug \#450646) and fix build failure on PPC64 (thanks RB for testing)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

14 files changed, 217 insertions, 41 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index 13c6bb454129..6d80bcaf5d97 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.42 2013/02/02 16:44:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.43 2013/02/06 01:45:21 ryao Exp $
+
+*spl-0.6.0_rc14-r1 (06 Feb 2013)
+
+  06 Feb 2013; Richard Yao <ryao@gentoo.org>
+  +files/spl-0.6.0_rc14-fix-atomic64-checks.patch,
+  +files/spl-0.6.0_rc14-fix-mutex-owner-check.patch, +spl-0.6.0_rc14-r1.ebuild,
+  -spl-0.6.0_rc14.ebuild, spl-0.6.0_rc10.ebuild, spl-0.6.0_rc11-r2.ebuild,
+  spl-0.6.0_rc11.ebuild, spl-0.6.0_rc12-r1.ebuild, spl-0.6.0_rc12.ebuild,
+  spl-0.6.0_rc13-r1.ebuild, spl-0.6.0_rc13-r2.ebuild, spl-0.6.0_rc13.ebuild,
+  spl-9999.ebuild:
+  Add virtual/awk dependency, fix build failures on x86 (bug \#450646) and fix
+  build failure on PPC64 (thanks RB for testing)
 
 *spl-0.6.0_rc14 (02 Feb 2013)
 
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index f84c7d881a37..e375cc31041b 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -4,21 +4,23 @@ AUX spl-0.6.0_rc12-fix-race-in-slabs.patch 1822 SHA256 6375b164125e1a7a8e022b094
 AUX spl-0.6.0_rc12-linux-3.7-compat.patch 12915 SHA256 f28d19df37718def641649b90ace5a00063bd9789e999cfcf696fe6374492123 SHA512 9352eb2bc7733dd029cf5ecd17c0e1a981ca65e839fffc367c9f6e786c0a374f797a70e6439d026999b31e824de0b97eab7ef5fb324c626964758d48eb5549a2 WHIRLPOOL 2af6b22e0ab0960cd923403f96ec7752a10c19efbf611b2c24f72d75b302aa6de4c1ee32f2af44a03e65fb17baab92574a4b667b13746538c7cdd2dc2540c48c
 AUX spl-0.6.0_rc13-fix-on_each_cpu-autotools-check.patch 1508 SHA256 1ef61882e689ed1182b0e77a3b27ba108f18fccff7311462d9c8aef29dfa9056 SHA512 b9bf99b52f3135cb5ae017409ad773e7741536ed6c7181cccb8d97aa627a000417b24971818894dbfa0158a81f4a1be7a9627896b69d4f13988a99f1a39c0bfe WHIRLPOOL 9356a518a1d4a661c4a706347d00b2ec2873198fab379d5a644dde0fc4749f43a9ee542bcf65884de25b97a0e75668a2bd741ce4878ac80c398346eef4b55884
 AUX spl-0.6.0_rc13-fix-soft-lockup.patch 6154 SHA256 85173dcdd261f6aebee9e04098201c58164a74ba01d4a8775d6fb3c7c197c69c SHA512 bbc4d30be0f4425cc1f6076f1ed8d572a8255052f194ad47bde7a9b837689786dcf131326d50f8d4e23d8f0bbf79ce438c273fa33f7c98cdf0bb94c4673c4a0d WHIRLPOOL c4a7efb0858a92da466a69db14f4559188a7f731da7eeaf4f17470a17acb60d81da41c22b6801116d23eb71e4c449097f2ce2af386fd6c3aa915ef7718f49dae
+AUX spl-0.6.0_rc14-fix-atomic64-checks.patch 2327 SHA256 f3254d8c739ddd013ab99619e11263b5591058012cc9da0c066f60da7d3d52ad SHA512 90e2874904600ad191eb594b9ace2ab85c01943b1c5e190fc89b0b91e322aa30a4a32ecd8a407c14b9f1a103676c9956ce03ae5b7ebbd4ee7b962e86b7565245 WHIRLPOOL 59fb9f8544b1e7698e130985f3b95ad0ff419f8abffc705216f6236ac042b16a1bb7dafda586fed51d6fe2761b10e584f675a03b06a89ca503f6e92e9af87f58
+AUX spl-0.6.0_rc14-fix-mutex-owner-check.patch 997 SHA256 7060f161cca637085f0f102a497e26246474bb7239506f7e66cd38b524c711ab SHA512 82b40b9cb92ec3be6b3d22865f807b1925cc273af4bbe798391ce59db044ff0a4b1db48a16c407eee9be48a7c5a92014cb3c2417c1c8783dc2339c3763b5ee44 WHIRLPOOL 3b6deb69e815695ed3fd4100dad27235646563269138cd1abe94084bdd7f5465789c1ee70ed2bc4a8ece5612342c86f57a148571d3b3de5d4a7472d67e8dd4a2
 AUX spl-0.6.0_rc9-alias-km-sleep-with-km-pushpage.patch 2071 SHA256 d34d56201046c6464141c50c815a956e200260c4b17a057af2dde6fdb5fcf949 SHA512 8decd4a803b85b46b5c241eeb0dd7b44e0491a972b08094d763a20d5ef21624ff0bbe79e56098600702f78f506e842c8bbfc3bc94067b86531399b0ba0b4285e WHIRLPOOL 5fbe166099b10e1281e5d824e25acd7f4467766d865e6c297dd8b503906b12bc63221babb0fb6e9fade65679a8637489cec16ac3e6e14d54457c9cda858db9db
 DIST spl-0.6.0-rc10.tar.gz 523189 SHA256 b25a748b18522f38b495f3577905ccd296f2782d1180140a05bd1efa19113ea0 SHA512 c5a01c9d42afcc3c4069b771fed2cbdc20d621994d2709a06057d93aeecc1b15c442cf5bce4cced90ecf7ac841f610e0b55b678e2bde8b853aeefac4402baf19 WHIRLPOOL 961edac42c35b1ecf65748eb2fc9876ed8cf1207307eedaba41a381e519589859ad5bbe468f7b94d563ec954e10c47237b4540f63a7ea211bbf9d92158f06b11
 DIST spl-0.6.0-rc11.tar.gz 521190 SHA256 0f39edfb87c444781080e6f60acbd1094e3113cfc85a23d4e997fe0d53ce3a2f SHA512 d85dd2b10f98028ebc77069e63fd54241d7e8290cf81856cfb82648279e736ce108bc02b21993a87b8e8a046c3a3f37c0a3ede4cd32a4fa6be032316b47c5add WHIRLPOOL d49b863321173fa8effdaa338df4b8171e8db54f11b5f789a618ffa6abbdfcba721d2d38c59bac77786fb2d64096ed1e8f65a42f7ad2ab37a581d5e2493c05cb
 DIST spl-0.6.0-rc12.tar.gz 546842 SHA256 5352ecfa3bed7807bf4b154121c7f6349d986fea44125bd171240985ef28c898 SHA512 d71db7cc6e8ddec13f90a089a60d9b024f16576ed47b5458b88b7a8efad833b95219d9802c57edf76bfa77e65fd523e31aa768a37f8cd4036c828e7e4cf0534d WHIRLPOOL c6adccbcb9e7c30bead63b94168fc6348cd25ce3348e9e8191797b4100481fb727633760692c8aebb263062b393ae843aeb97718d106ac611e6664d1c5d475b3
 DIST spl-0.6.0-rc13.tar.gz 210192 SHA256 500d9c9297f2b7abdc4fce43efe05dddda2edbe403f9ca76d01ae632f798ee1f SHA512 630b63c15e98ada397bc8b8a1a5b6a48255ffa5d7fad8dd0ed9ad7fbede32f3557651effcc99234ffef1a1b9bb13e289c0ca5a2cf60307e0a57ac3a93b709f6b WHIRLPOOL 9330dd1567421e610a714b69d096bbae66c102baaf90fa3daed45cc1a2928eb3dd0e8537f3cf83a7fb2b157bf52ff37b031bcf6c9f52760acd6e480ad335b69a
 DIST spl-0.6.0-rc14.tar.gz 210495 SHA256 92785e2c2c6caf93ec31175e192a18b27458613a99e6578041f6029875b061e3 SHA512 85d066a97d62ce60f60c552d121c20d5a719e95e0eb6d7ec1b10e29acca1e3429a751bcbb811e9cee2a14282c8908684cb9ee0df9cbc8e53ddfe47da18df4cf9 WHIRLPOOL 6473236476dd9a2d392e2f71fee6810ed83e68f309d1eaaa5fbad1f73ae567ad629db97a2bc81a4ad9e28991f4be3d4100c1b9ab0f65941206afe6e5b03f64ab
-EBUILD spl-0.6.0_rc10.ebuild 2196 SHA256 d759f18c10b231cadd3e906e4ddc7fc4169b7b12bc058e52a48f32a6dabf16c3 SHA512 dd43e952a9a2aa6179fd953c554f1c1e0b6ec49d63659168f9780451b4b46916db9577914f65341a6f5ef13acaeaabd13524453e3fa328de647438d9dcf8ffc2 WHIRLPOOL 0927b113384d7e20b3d566bc3a8d5e0e35360b1637238ac3f83fb6d023316d7c3fdace4d72b828dacc17acdde9745d869a4a10f94a0b433ea3fd300254a8a438
-EBUILD spl-0.6.0_rc11-r2.ebuild 2315 SHA256 eb4398bc535f0136b10d2364323c6233941cb19306620f31b1ab3e150bc327f5 SHA512 49110722c85bd6929b107436a36824cce747a968d62aa85f3cef9eedd19bacaa0cc89df732ebb79fe15f041d642a4fe3a8f3fcf80a930ea5e3f8de01c127f7e3 WHIRLPOOL 869c9e189103ada5ce94c9a7acf9257b40f48d6af71b4dbabeed78956e8b7fc2243d91f5d8741628e180b62e87b224ca54a7e56edea626937b30c3dae79c7b0c
-EBUILD spl-0.6.0_rc11.ebuild 2132 SHA256 ede528485719992eed75be4f985b0845cdf5cf92695eb6746505c413fdec0df6 SHA512 625b856b006195162a949850d17c5604b5ce42ce10755f637fbb07dc2a4fe34599b0e3abb02383c2a697e8eb4317b743937fe9feaff22937c08a274408111325 WHIRLPOOL 581e096921fce5dc931278c9da4ce5479a7260b0b74fafc9e0bb5d1f5246d66adbafd999ef601f967a2aa5d5ed7b3f991a3b0d35a813c850ea42187fa566f7f5
-EBUILD spl-0.6.0_rc12-r1.ebuild 2331 SHA256 41b0aa3fbb5283b509fc17d4153bc02463365b7388cca21d03506e19c2948719 SHA512 afd25d8c892ef7b6b415706a402047bdd9a78f9b8da148aa9f7700643134fca01710b5f2385cd0299f99e4913c768a8b275fb299f8bac5d622406329ba6ea954 WHIRLPOOL 55d81dd92eaaf4fc9a26d3320a8faee15ff0ec97a4db040680117699674823d8baf5363de3ca644f36391ac3101e842a589dd7396f3ac16869d49660bdfcad86
-EBUILD spl-0.6.0_rc12.ebuild 2106 SHA256 8be696d93fc2016766e9d8b1ea25a268b4f8e9a1a23b3cf3224458341f1f24e7 SHA512 a2f1676ab1c6e76e1d91c698f3f90f956a18ee042a8407b3241c79e61b89b5c82a01812d44b2ee4bb2b6052d3c808e5a53db1e12481eb60fac1e049aa67073f3 WHIRLPOOL fb3cd18272c1efef67e0ed99fb0dccd617e3cd714fb739dba08c26c75409718fa7fb346a858cb69f7428ea7f3d1f4202729be55359e9d330282a381522f80c3d
-EBUILD spl-0.6.0_rc13-r1.ebuild 2344 SHA256 e00e89d79612537500ad054863113503c0a70d84794f51eb04b709c7aa1fcde7 SHA512 a7ff5271ffb7c2eb8744ee99c04daf8b7ddbeab0593d4e709b54d8108791c9030a054769bdbf1d7401de9d3e6871cea47be88c32bb86d9739fec32d7510a06bb WHIRLPOOL 305cccc02ff5f651494b6d07426c91b396eff1e28bf9366d977f5805f22cd5f19224b44173faaabd1a5b23495e980d2e8f3c3f963d05cfa98cfce83e9b818177
-EBUILD spl-0.6.0_rc13-r2.ebuild 2367 SHA256 0904657baafb84e3898731573b617f0a1a36cce02315d1ceca868f727cf4db82 SHA512 ac9194c0574d8f7b90779aa5ebf711f7c30b5d3a496fa964a14caffde58a544bfc31a1f3fd202599a70cf88913fc9d7347fbddec790c4e376a2e0e2ce0feb4af WHIRLPOOL c4d699f3041416bc27e93a0c7cdcbe7d3cddcf1d172e82f148ace319ef3802eafb48ac9ac1e9aa366b7d1a08c93ee284cbc085e1005c8a41860ac1645e965611
-EBUILD spl-0.6.0_rc13.ebuild 2110 SHA256 21a365c7064d25c9a2a04d13ef90002b2f302f1e696a836eb0fe753cff143f9b SHA512 ca7f87521c6f7b74b70f048f3b2bc5b16e16b94006f6c020d59c6667548c79f3efc8d35f069e3a55a6b4e9fddd227d1a0951a6472392be46421e75ea6a42ce9f WHIRLPOOL 5780f7d13a2e90bd0442a330e39ab3d06887fa9e48d5baf85aff9a8434e75d2ad7ef8ab9950457a00f212c86ad51e79ba3efe87056dbfff0f65538d155f9ad71
-EBUILD spl-0.6.0_rc14.ebuild 2133 SHA256 217fe358089fa2dd72d0bb040044acaf43f8cea19757d03010638b646b1e1a8b SHA512 1494351554cbc9a403c869244bf0e72eac86657721c50592b587365f8a1cd7cf8ebd7cf5177f40957be435f3b74d81c0818b8379d29a94c175f04714a3a3aa1d WHIRLPOOL 36394e68e9acfa8a8218e14c8a66d2b90e0fb90ca9bbf36774d17bccabe1e33201ea24b28d9bd1019c7c3f31cec4dfab2f8e8a3c6daaf301f24fcc33b6fc6eac
-EBUILD spl-9999.ebuild 2359 SHA256 185d1f98d350d65e3e0f443c744a87d65e67c525fab506f760227640b4fcae25 SHA512 1006eee53fac5e54b3f149977f9a3cc8afec8646161b0638c26ffdf252a8c48702ef2150781a03528b9db9a22655a723a1ecd400776eeef1fdb51fca1cab5fb1 WHIRLPOOL 16aa3cc6b9a8b31d208550a1d4df687145b801873019ed623178a51a8e6bc95f24bf56490460af2b45e7f58f21849b072c9ab0a2834505078f6c455bb41bbf66
-MISC ChangeLog 7196 SHA256 1e086058f1162d2781e8d6223fd36fa66ec1d69203eb5aa2d8b9871fe9675ca5 SHA512 bde0218d3aef0fb721d2b94f77f6c0b05e68ce0dd20b282069d352c81c360d909fc0b9acf3346afc46e75ac1dd35ad35934aa3ff2ba12fb77ba4b08cc6185bff WHIRLPOOL 2607a516d35d692ce39dbe9fd40e05c96cde0d743abfbb07fbd1c1b0438b0051ea8fdedcbc09bd4f442e4bde7ac2f5fd7800b1c2b0c92f3987da2f8480add3b0
+EBUILD spl-0.6.0_rc10.ebuild 2270 SHA256 7e92260be5292c5bb21c7ec72ecfc6cf48493a185aa32f0acb7fe9c03eb48593 SHA512 b5f7f52d4c911c5bee17a9623001dd4cd53f9e92efa837693e8fa4c8a124a370d05ab86fd0d53b7f1e9e2133f34749fea9341c3b3a62d80ac53d9cf717d87d82 WHIRLPOOL 5c07c427d66c768bf0381d6289b43aebb0acc4b7b438aa07c7eb165e88621481750406ca7284af3730ff3c429b57e1d4fd04cd9f8dd416ba3925840f2b618212
+EBUILD spl-0.6.0_rc11-r2.ebuild 2389 SHA256 92e7e9fa0e7bbb39a4f9c302443b542b321be6b35a56c90231c0a760921d1937 SHA512 d2b3e3f67c4c69683398392465d8fd1c3e1ba7087eab45f2c39cdb74d314304ba706ad5769742f0bbb7eb2dcdfaa1d5946f968dc5d58df092dd02eeb9d350056 WHIRLPOOL 5f10a92a2c76130b931cb70248bcffb9b06061a3c4c3bcb39593452c7d9bbc3b9a4737cb11dea1bda2d0c6cdf393c0e17baa3d768f83a923df9488776d8d1986
+EBUILD spl-0.6.0_rc11.ebuild 2206 SHA256 a3ecf91b15147a7fac8b8c345f99a6400aae2d9368904260ffcbe947bbb1443a SHA512 e1b38b8abac67a5ba4801dc7978ad56245ff72e39a28ace601da860c625504298e26ed91e03ce51e7bf7262b0ab3d35643c9001aa2c9161acae28cb319c24d6c WHIRLPOOL 15c334f014bbbaa6567ff1fe3769c41f96d7192a1f91476a69def5c153eec613a2acc39253d1758796fffad37213a009efac9d09955be5fce0304bb00436c128
+EBUILD spl-0.6.0_rc12-r1.ebuild 2405 SHA256 593bc66ae7567628928618279b11417a6fdb669da8e3783b1acb9b49c9c04091 SHA512 033df4488c5be473beb35bc7cca4bdace3201d2ce499d7189e447b2b8b7934a23aeb0fafd000c1543a4a8268218ec3baffea18446dd7f2f1b66d910b3a2b5a58 WHIRLPOOL 5e329a1910c587d4ce83243b4425e0efc6a094a05e9cb7d6a214bc4bd153f188e0f044d4a34acc4faf5c2acc1b76c52b0f1a0b3cbe9cebb83352c4d0fb3d2d98
+EBUILD spl-0.6.0_rc12.ebuild 2180 SHA256 f8743858eed39d98302bb9a63cb218e4681b7f826d1da4f9204c7216129ba48b SHA512 4029ec5377bf66f46f5d5343a5c18b7f08f54737bd721e68784db9dae71eee117cd7e6ccc060034621cacc91eb4caf42fa8b4ced4caf7b810041015662ab3768 WHIRLPOOL 7c4a7c1e834839f19e1f4d042bcc3039ca2a8bf3059bde206f2670c2abd454b8619935100042ddfd79172e1097cf0bef245a1f2116a53623fc8aba5344869c30
+EBUILD spl-0.6.0_rc13-r1.ebuild 2418 SHA256 06d541b6dbb6ab42e1558ff5eee17fa0bbc72267934ed7203a98a66e9f6b4f75 SHA512 0b685f87123346bf5cdbab2c0102e98103c85e6324d8003ec51bf6d8719da291513d994e76931d7fed4552d624c7b73bfd6242a8456d7a85ed4a5d89adde4785 WHIRLPOOL e80653195c82f75191f14e48e2eab2f4ba95ab56fa1587897c1d93da2bcc7320cfc20395157638384c7f47cd9115edce71d1f22b268f667f5f46b3fa1422b7c5
+EBUILD spl-0.6.0_rc13-r2.ebuild 2441 SHA256 0336a2a57270a032e96f66cd467c1dbce64ffd34eda248ebdeab70f85eff242f SHA512 90a858d44b5346500f29eb3d05ee35195e2c97a6633e407a7be568bf98e3271b8cd3665942f326b0ffb1122c7f395d3c552061f85e9a48768acc3b541c0b89b3 WHIRLPOOL 5a82db1aaca745d0d8a9d62753b003a670086ef5def314de7a54b690090ea58be943068ad19f70669c1b119b1e7f98abe7dd80e8aea94a2d8d30fe6e3fc28f5b
+EBUILD spl-0.6.0_rc13.ebuild 2184 SHA256 33647f2c160bf3922d4327677f45487fe8352b9d6ebc7d3ca5c7a132cd6225df SHA512 36b1dad8a8d181744a3d3ca12ce6272c217845d6a350ccd4e9ce4927cfc5c24ac206dd88978ecace616881c0b78e60642bea609b9ee61e1e079ff1f19f2a8941 WHIRLPOOL abecc7f63ed1bfcc386103e827b83fbc46764322d29b3401b71c6120dfff20ef6a6d11c215ae41d1000068fbbb8b6250848be261cf71e01ae7f85462e0074ed1
+EBUILD spl-0.6.0_rc14-r1.ebuild 2464 SHA256 cffd632a2c1faa6f5020d51f6d7c3d39a43563960f3f5197b7f34bb7734bfff9 SHA512 8a5358a196b07b23e55d702fca3dae517d7529f8754b80a2f6d62fa65c1daddf57d0c199850da0316917a250cb558f7f7018ba867b5ebb7abc00251e692e4092 WHIRLPOOL e357b6907d86b0624a8b3b80beb33e9176a62e96d2095108bbce8c3b7e162c0f989317e6f829bd9b0f8a18f41dff2624f2921742f26c8c78c3fbcf79312ddaeb
+EBUILD spl-9999.ebuild 2456 SHA256 9adc2d8f018fd6053ab82ec16e5e6e84b0122422e2126fa469009bf7cc888bd6 SHA512 c78e9a081186dc2f72a2fd1c43ea2f2131e9bbb38a955f1e4be8c27532666cd53bf083021be97433c23f1e3fb8a6cebb36ba725263c57015d8aa39f596c99170 WHIRLPOOL 00d4e3da3d3e6c1831aad13256928f3686a8089afd18f45521f20d97850a9a2c704958693888d0e345eaaf7380ce18361c09b50f8c23f65b33768c13941db38d
+MISC ChangeLog 7780 SHA256 32c1cd8f9eebfafcf9f51be8c33f36c3d17c92800515e7bcd8577a94a236f89d SHA512 5a4448b0fb7b908a6c786902590cf6a7c38e91bfba3f9c3f8907add9d07744f2a906150e026c9be77b362401c59160b43757256d12d3e10fd4b633d13229d989 WHIRLPOOL 96ff53cd60dd4497c9eb6979de4b0b2b1b6bd3804370a2d1fbb6b6e36bdbb825c6765889c47de0970f4db44620cce55227df2a53faba431e788493b275263a91
 MISC metadata.xml 305 SHA256 1379ed630ee72009790f82073e4777a26ca612e0c023825f4a2648266422672e SHA512 ec56bad42e58b3979698fe6607ca1854b018d2292f02f79f6cda070cfe1489b31d9738cfe886597edaca36dbe839a8d909c78f8e4c47b1764b1a0d586df75d33 WHIRLPOOL 11016324ed29ddb27d0c67488e24d15d8d34881a20d21d2807accad014feb4e5b29ceb8d72134f7d8c58d5f83b91c157290c51ea883a5f8007499e73d02acbcd
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch
new file mode 100644
index 000000000000..9ac8a4308dd6
--- /dev/null
+++ b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-atomic64-checks.patch
@@ -0,0 +1,70 @@
+From dd3678fc29d75286b57e705454bbd7e60e1b44e0 Mon Sep 17 00:00:00 2001
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Date: Tue, 5 Feb 2013 09:35:43 -0800
+Subject: [PATCH] Fix atomic64_* autoconf checks
+
+The SPL_AC_ATOMIC_SPINLOCK, SPL_AC_TYPE_ATOMIC64_CMPXCHG, and
+SPL_AC_TYPE_ATOMIC64_XCHG were all directly including the
+'asm/atomic.h' header.  As of Linux 3.4 this header was removed
+which results in a build failure.
+
+The right thing to do is include 'linux/atomic.h' however we
+can't safely do this because it doesn't exist in 2.6.26 kernels.
+Therefore, we include 'linux/fs.h' which in turn includes the
+correct atomic header regardless of the kernel version.
+
+When these incorrect APIs are used in ZFS the following build
+failure results.
+
+  arc.c:791:80: warning: '__ret' may be used uninitialized
+  in this function [-Wuninitialized]
+  arc.c:791:1875: error: call to '__cmpxchg_wrong_size'
+  declared with attribute error: Bad argument size for cmpxchg
+
+Since this is all Linux 2.6.24 compatibility code there's
+an argument to be made that it should be removed because
+kernels this old are not supported.  However, because we're
+so close to a release I'm going to leave it in place for now.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Closes zfsonlinux/zfs#814
+Closes zfsonlinux/zfs#1254
+---
+ config/spl-build.m4 |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/config/spl-build.m4 b/config/spl-build.m4
+index e9695de..8518404 100644
+--- a/config/spl-build.m4
++++ b/config/spl-build.m4
+@@ -777,7 +777,7 @@ AC_DEFUN([SPL_AC_ATOMIC_SPINLOCK], [
+ 		[enable_atomic_spinlocks=check])
+ 
+ 	SPL_LINUX_TRY_COMPILE([
+-		#include <asm/atomic.h>
++		#include <linux/fs.h>
+ 	],[
+ 		atomic64_t *ptr __attribute__ ((unused));
+ 	],[
+@@ -820,8 +820,7 @@ dnl #
+ AC_DEFUN([SPL_AC_TYPE_ATOMIC64_CMPXCHG],
+ 	[AC_MSG_CHECKING([whether kernel defines atomic64_cmpxchg])
+ 	SPL_LINUX_TRY_COMPILE([
+-		#include <asm/atomic.h>
+-		#include <asm/system.h>
++		#include <linux/fs.h>
+ 	],[
+ 		atomic64_cmpxchg((atomic64_t *)NULL, 0, 0);
+ 	],[
+@@ -840,7 +839,7 @@ dnl #
+ AC_DEFUN([SPL_AC_TYPE_ATOMIC64_XCHG],
+ 	[AC_MSG_CHECKING([whether kernel defines atomic64_xchg])
+ 	SPL_LINUX_TRY_COMPILE([
+-		#include <asm/atomic.h>
++		#include <linux/fs.h>
+ 	],[
+ 		atomic64_xchg((atomic64_t *)NULL, 0);
+ 	],[
+-- 
+1.7.10
+
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch
new file mode 100644
index 000000000000..ee7314d3cf32
--- /dev/null
+++ b/sys-kernel/spl/files/spl-0.6.0_rc14-fix-mutex-owner-check.patch
@@ -0,0 +1,33 @@
+From a0625691b39468d04eb716919e237f96a3987b48 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@cs.stonybrook.edu>
+Date: Tue, 5 Feb 2013 16:42:29 -0500
+Subject: [PATCH] Fix HAVE_MUTEX_OWNER_TASK_STRUCT autotools check on PPC64
+
+The HAVE_MUTEX_OWNER_TASK_STRUCT fails on PPC64 with the following
+error:
+
+error: 'current' undeclared (first use in this function)
+
+We include linux/sched.h to ensure that current is available.
+
+Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+---
+ config/spl-build.m4 |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/spl-build.m4 b/config/spl-build.m4
+index 8518404..4cb7e1d 100644
+--- a/config/spl-build.m4
++++ b/config/spl-build.m4
+@@ -1269,6 +1269,7 @@ AC_DEFUN([SPL_AC_MUTEX_OWNER_TASK_STRUCT], [
+ 	EXTRA_KCFLAGS="-Werror"
+ 	SPL_LINUX_TRY_COMPILE([
+ 		#include <linux/mutex.h>
++		#include <linux/sched.h>
+ 	],[
+ 		struct mutex mtx __attribute__ ((unused));
+ 		mtx.owner = current;
+-- 
+1.7.10
+
diff --git a/sys-kernel/spl/spl-0.6.0_rc10.ebuild b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
index acf1d8773a05..af7374fd0c6e 100644
--- a/sys-kernel/spl/spl-0.6.0_rc10.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.6 2012/12/29 17:01:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc10.ebuild,v 1.7 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
index 9d5bfe751060..48b390d678a2 100644
--- a/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.5 2013/01/14 21:07:59 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11-r2.ebuild,v 1.6 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc11.ebuild b/sys-kernel/spl/spl-0.6.0_rc11.ebuild
index 1debe2581c31..b0c94a761ee7 100644
--- a/sys-kernel/spl/spl-0.6.0_rc11.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11.ebuild,v 1.4 2012/12/29 17:01:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc11.ebuild,v 1.5 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
index ffc5a8791ad9..4e3222b8a5b0 100644
--- a/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.3 2012/12/27 11:47:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12-r1.ebuild,v 1.4 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc12.ebuild b/sys-kernel/spl/spl-0.6.0_rc12.ebuild
index 65ed31c65201..a89c8124f102 100644
--- a/sys-kernel/spl/spl-0.6.0_rc12.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12.ebuild,v 1.4 2012/12/29 17:01:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc12.ebuild,v 1.5 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
index bef98ca40a7d..b176845c609f 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild,v 1.2 2013/01/14 21:11:56 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r1.ebuild,v 1.3 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
index a7b7e1849223..35fa279d54bd 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.1 2013/01/16 08:57:37 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13-r2.ebuild,v 1.2 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc13.ebuild b/sys-kernel/spl/spl-0.6.0_rc13.ebuild
index f28b0bce4a5a..e6f36dc0bb1d 100644
--- a/sys-kernel/spl/spl-0.6.0_rc13.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13.ebuild,v 1.2 2012/12/27 11:47:22 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc13.ebuild,v 1.3 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
diff --git a/sys-kernel/spl/spl-0.6.0_rc14.ebuild b/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild
index 21275d398637..3d577aed0472 100644
--- a/sys-kernel/spl/spl-0.6.0_rc14.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14.ebuild,v 1.1 2013/02/02 16:44:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc14-r1.ebuild,v 1.1 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
@@ -54,6 +59,15 @@ src_prepare() {
 	# Workaround for hard coded path
 	sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die
 
+	if [ ${PV} != "9999" ]
+	then
+		# Fix x86 build failures on Linux 3.4 and later, bug #450646
+		epatch "${FILESDIR}/${P}-fix-atomic64-checks.patch"
+
+		# Fix autotools check that fails on ~ppc64
+		epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch"
+	fi
+
 	autotools-utils_src_prepare
 }
 
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index b8b0babe8c4c..accfa2a6d55f 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.27 2013/01/16 09:01:11 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.28 2013/02/06 01:45:21 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -26,7 +26,12 @@ SLOT="0"
 IUSE="custom-cflags debug debug-log"
 RESTRICT="test"
 
-RDEPEND="!sys-devel/spl"
+COMMON_DEPEND="virtual/awk"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-devel/spl"
 
 AT_M4DIR="config"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
@@ -56,11 +61,11 @@ src_prepare() {
 
 	if [ ${PV} != "9999" ]
 	then
-		# Fix on_each_cpu autotools to work correctly
-		epatch "${FILESDIR}/${P}-fix-on_each_cpu-autotools-check.patch"
+		# Fix x86 build failures on Linux 3.4 and later, bug #450646
+		epatch "${FILESDIR}/${P}-fix-atomic64-checks.patch"
 
-		# Fix soft lockup regression
-		epatch "${FILESDIR}/${P}-fix-soft-lockup.patch"
+		# Fix autotools check that fails on ~ppc64
+		epatch "${FILESDIR}/${P}-fix-mutex-owner-check.patch"
 	fi
 
 	autotools-utils_src_prepare