diff options
Diffstat (limited to 'dev-libs/rocm-comgr')
23 files changed, 10 insertions, 751 deletions
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index 6efb1c0ea1e5..c86095976c1e 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,23 +1,8 @@ -AUX 0001-COMGR-changes-needed-for-upstream-llvm.patch 2391 BLAKE2B 2873fa0aad01ad90c9140e54219e40ada995ed69ae9ebe83d79b8a8e674f23bf63a49457d6795cc78260df63ceed8407512edb205d8a3378a217cd3286c8de1f SHA512 83b1b0b2b2baf2ff36ef2d8aadf4083ba8c83f9df56753850780bbb025fde8f4714ac9437c78116d374577b9183f7c7ac9f3f9215ab576359720905900469789 AUX 0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch 2249 BLAKE2B 50208a5f2bed91d52eeec4f192cae5fe57d5f43221dd6333ed8e95ac3e0047588952ab2ca2188d4b401354032ddfa24b83a0e8e8e416748249001910abd2ef55 SHA512 cc9a3cab03d0d7c930b667bc61ba0404448d4ac1c3adf708c994c8e0f9d49232edc3beb1209ebe72990e97793f7b34ae4c9f68745343e07f6fa873989c12a14d AUX 0001-Specify-clang-exe-path-in-Driver-Creation.patch 2098 BLAKE2B 0bb6902e322ba6354f5cf31b6b7b842d0db43a1f14293edf228c31bb299a336267c573f5ddbc2bacb0525468625b98b260cc81d1cdd7fa43cdf6e484404b3f5b SHA512 26bce5f9fbd964774945e1b056985aead0a9dedb0c85256eb7b9556f5a196cff9aae6441afc9a6f4fe3e7f7178ce4f6032fa7c3b9c7b4dcdacf1d26c0011195c -AUX rocm-comgr-4.5.2-dependencies.patch 1255 BLAKE2B 544a23e8066a2b308e2f90bfaf7e538ebe9b4becd5d84f3c4e8d563c01148e298c556fcec8639861749ba4cf838bf73e98a8231e0d19faeda6ea5d7df8459629 SHA512 4f7be98945217fca917b788f3ac93f9d5356d410d3c17f5fadda753d6bd5121c57ecc2c758c430f6d4a2997bc61b5d54b3b8be6f6af1d575c0190c635cb64426 AUX rocm-comgr-5.0-rocm_path.patch 419 BLAKE2B 2adfe03cd86d84b1f183689e5feff298860c22b12a87bddf357d746d96f2e4df3de3d01962138e02b7670b28a7884d4b16fe9f52f937a22caf931e74bd46de21 SHA512 1ca24101e3c296127a7b429f0f6b05bbff388a0db2d4ffc3003844353ca43ddf0d95c4f13c902b841d748c19cfa11c39a300786af04919da3919b8aa7724fc1a AUX rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch 3434 BLAKE2B d5841e32974bb8750ff7d9d32256c13823b26a7d200c603162c66b04dc55ae0e5ee795a449f2e6f35a2bd2efddb5c67b03499d2aa4e441fbe54a5f8178e167a5 SHA512 d0da78fbbbdc9ee3bb4f0d4f98b2321913f9ad197edd1c0128c4785d14134646a5f8b9a1b75e268111dcb4dff872c0b8db398b475fa8b28c83324ae5801bd279 -AUX rocm-comgr-5.1.3-clang-fix-include.patch 298 BLAKE2B 2cb424491481445a29fff40cfc95284fbf8dce155c65d5cf2ee950fc5c876b3c78660691878ff45846904a9db54f7f5db7581fbd1665156c97f660bd0b69fc48 SHA512 a3b024899d9b0d59b4c8d9dd498349775e25cd428437d97da1de689e14bc8cebd1b3434d9ab034b5c894945f743426abae2ba3ec129084ce9fc176b3cd8befc4 -AUX rocm-comgr-5.1.3-clang-link.patch 380 BLAKE2B a6de9401ff4c668745f49e898546108163c1cb370e2591b6b512e70e4ab63edc4256baca7d9a6a62c6263397764053d22791cc85278d5eb4ef3a766b69bba96c SHA512 1738fb93087c24c05fc8c025e2c39b019cd71534e2878a430a8ab9381d18284053c76f646d29314b33ec80ecdba71c4ac583ab40a5478b607242518aaa198e26 -AUX rocm-comgr-5.1.3-llvm-15-args-changed 880 BLAKE2B b499a27ef0b66e106517621f0b92156985f4acfbfa3212643306f28fd41874228ca033f5d2caefe11501e14873d3ad121bc4e4c86c5ab9db15455035f2adfd47 SHA512 ee0b30cbbbf021aabe8e042cfe6f0fef5e5bd1ee5d44600197137095cee78912aebe520bac0cd79e08ecbd9c0335386c1a972ebd689cf42d0526cfda18cbfd9f -AUX rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu 879 BLAKE2B d89e8b2c908d360b34da0802497aa14828efdc9353b28ea956e86826f0b7cf69faa5b489679255ca984553affb51bddfd47891da451662e8ebfe79114605c496 SHA512 11778245c2ad8bc11dadf3613df5ce8f6911e15a9850ce22b3962d18ba4e990cb585e09b9cc39daa801c7933329fb3d1541026e90da7aa5df9038a00dc9d7bcf AUX rocm-comgr-5.1.3-rocm-path.patch 422 BLAKE2B 23200a9ead9cefe1af9b553da7448d93b1c7d0db7aa02a2dae0fa0b70b44b75056fe720fea8919c5315c5804289c30d6b476e43aa7aeaf25cc5c2430431f7a9a SHA512 6d1d2cfac7f2b70409e8cc3cb1556f516f495c4a217e85408fbd99587697912d82fc6a8745c37d2fe392ddbd0e8503489c353f26b3fbc6bce640c567f4230e89 -AUX rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch 632 BLAKE2B ce681da93373691d24c7e85698f72477a372f65403ee25ba085bd3e36c79cb284b88ec50b9c16e5fe14fd3ce9b88fcf1486120032dfe6f97e9a85e757374a38c SHA512 b88fcf8ca208a7ce30777694903af0a4ad9c2c8c1a93c361f6b6b6f6948073f06ecab5ca607250befe0d16a9ffeace9617f53b1288fcbf43396b5b658e448414 -AUX rocm-comgr-5.3.3-fix-tests.patch 553 BLAKE2B f4227305c4c2c91d3fd1e9ad7fdc4477132002cd6cde8e7e9abd3f336978ff0ee9560f4f6216498c330c769cc3d65f52c2191d0298f3f82b0693bc4d3c4c0d4f SHA512 e2c6d3a9315469e4e53d0067bfddfe5d014a546b789ba7fd672204d4324c4fb19a4cdcdeb5bc8855e53cd5607e60e31677241993f4de1989aa68ce4ea5943706 -AUX rocm-comgr-5.3.3-fno-stack-protector.patch 546 BLAKE2B 81da0bbc5405433600b60be432997134b4e7369814021e5c3a3bc1b88aec33c891de496f4d2af34c3c46742def8679092c0c6b1680babf58026d5e6e1ede7806 SHA512 f1a8da61c722f9c7ca0ceeab29f1032e5b488223a0c38a118608d75c2e4ab482625fffa75f8c85d1cb8dc9dd3b76ee8405e62405dc6e71ae6521c08acef23026 -AUX rocm-comgr-5.3.3-remove-h-option.patch 2060 BLAKE2B 593c3aebc4c9eeb387bd88ef31dc8e9a40434ef2497ee96f6dcad816a7e098c657987355e82c15566dbc71a168fcc5f584469903d8222d71c63bf68c0ae315e1 SHA512 2364449ed85963adbfa2a80a9a6e15e7a73ae642c17549da02fdc6878d93857d61f18d862cabfb7d56b27b052cb3de8abbc8c9d25a2d3f54288b15a6da293775 -AUX rocm-comgr-5.5.1-fix-tests.patch 567 BLAKE2B 21fc4121c75d6510e5a263388a0129cd9a1a4e4d1c47124774cd4372ad0323349fca303c5dc71d451c0c2fe108b8f176c577c4c4021c84ba2687a3e4d94196eb SHA512 175e27600dac3505bbac14d559dfa44785feae693eeeb658ba99e27db888815fc335b8a648234478adb51ef7cafca0b762e9227ac2c3d601d81b88d9d1f24e41 -AUX rocm-comgr-5.5.1-lld-include.patch 795 BLAKE2B c2e58f098f751c015154c8b9c775a5e2ed9bd84d3ffab3a1d90535ef44ce51542d4bf2a104be464df85e0059543444f69b5e6dc9e55a607f4e1133dae173a6cb SHA512 e223c2d341d05f10868a59856794229b8ec7066de5c264c1b0b014be3eb0c82ee5966c33d2c69b721661b7c51194d02d2afecb49dde4fb542a78c15db0f12780 -AUX rocm-comgr-5.5.1-nullopt.patch 785 BLAKE2B 329f60db229bd8f75821c213b108c2342fc1083e9f82f516c40e96318c36a69de1be9865bf4ef5dc03864fd2646018f2150a04547e4ac60283042f2a3db6ced3 SHA512 f3f08decdca3b8619e724d79e826744c8da19d748b49701a6a221b2762c9a7b5bd882530e1c80ffd19e20a1794d86f9c557ede9a9ce703ca21a2d1739da45b69 -AUX rocm-comgr-5.5.1-opt_mrelax.patch 955 BLAKE2B b68c0681defcc63a09b425af49ceb2bd0ebd70f784014bd9121fea7b00ee090d855c544cee4312cfcbbf86b8205d25d36ac623c741d6dccb537aa27ddb9e584f SHA512 e26d8befea08034a2bfbb4cd13ffd418b95d842b8915ffb6129395ec4ab334917ee5a368e85a09f1bfc2b8021dc293327b2b3f56462267aa5e964e6500348cee -AUX rocm-comgr-5.5.1-subtargetfeatures.patch 1133 BLAKE2B 6a138bd5abee576c78e005745bb66c2beecb35737c02850f74f7877a9b204c0789d3fbbfd0815502b86602125f32b1b27cf131ffd216ec6a3e064606f8ec1b50 SHA512 0ca10166aa1c13f74a48468547d841fd173319fcaccacba00c7f70f61383095515a57eb5b97707f01d9859667ed2479da8d6f30253c39a8777c76bc1974c77a1 AUX rocm-comgr-5.7.0-disassembly.patch 656 BLAKE2B b1ac5227b7b4d7a25cc5674ca185075e22dc91eb2e64ea1598fae03915a22153cfdafee4c34afc34e7490515bbdb09d49ba290d4544c617f23427d04296181ac SHA512 647a0a613786df7907616af43397ba9b16a80a7f6e7420ac41be7cc424a94df7f3248875bcb336e13de0f2ae13832362c6cbc42356703b655efc58cc4d6e4b6d AUX rocm-comgr-5.7.0-lld.patch 1355 BLAKE2B 565e3052974b99ee5050fc1b64d5f3b337866cf21a5d37fa37888e6257cf00b1718a0d3933b3f0e4e27caca4537652824c1ce01a8600852da503eead94a12d8f SHA512 35e6b2c8ad97d3dd5a870ed5c547c3727cd384c773371fa9608e29f7d525252f34fb784798c82c2071098667fd69ca4b89dfee20a8bf28b73b14bd13b4b00a50 AUX rocm-comgr-5.7.0-metadata.patch 2738 BLAKE2B de124cc61ad4e59ca182a8868bdff0c2fa44ec8a474f4c2d31aae8b90aabee6b32394959dd3589cf4756d09cb26dc1691df386f0b6687bb365dfabe6b76f2622 SHA512 440a6cc6fed0c4091effc39ffab5b4f59c0d503db7ea6bd8eae681422b4b385f3f8176722f7a2b396cced8229a9c3904ac795c62949bc805284e6a0203ab9bba @@ -37,20 +22,10 @@ AUX rocm-comgr-6.3.0-llvm-19-compat.patch 2564 BLAKE2B 823db031e8e09946396f7e4e7 AUX rocm-comgr-6.3.2-rocm_path.patch 419 BLAKE2B f6fa0d84b91811f8aa70bdbce429f66f8f02ec99d480cc55e5f39fb7ca2de3bd5e55f5cf0d5175a8e78e78d2ecc197a38088d91774e564db96f1168f84b8c0e6 SHA512 59295419d96d78635586407342b592fe795a66c7d0b5698a187d190cf34667b7bd451702131b825e76cdc198cc343062f4d2af825590e80bef16f29a5b68ef8f DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0 -DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59 DIST llvm-project-rocm-6.3.2.tar.gz 206671202 BLAKE2B a280e2be22b8eb9fd51814074447baed3637231d4bfbe391047a1fb2409197c8d8ba58cebb3aeaec15aa4daee9371311274b30ede48e0039d7c84e432b15de1a SHA512 314e27577af76268635f3c96ee3516829e4622913c3d0c4c68eccbaee0c9f7f5fc031cbd35827deb4bc29712592c424e296c15ce8c500c897bfb3eb19455899c -DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b -DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f -DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4 -DIST rocm-comgr-5.5.1.tar.gz 127475 BLAKE2B dbcb6729b27c0b4a4be37f5e462d96b10c15a6a3b540a81a74a648fc45dc727ea5706db1a0f4583a31ac4cb5c9f0d9f4e258fa5ac792b327f4cb1dfe6d585937 SHA512 09174ef2ad21f62b197e439bb5b04a365233c360c57cc2ccf0ea3d53edfa8880dff4f127c6d6c1d430b63b6f7ea666705b14cadc2bccb89c0fefed943b0cf1c7 DIST rocm-comgr-5.7.1.tar.gz 137923 BLAKE2B e215f51137fd0c4b67e85496bf289dc0afde6ebc9efb9416f5fc4cf312b2be9be26da35cb70965bf4857a0f1434d750bcc03ce83095173098487ef7805948735 SHA512 cdd2609b858d9503c30122a2d328d36baa8a930a05bcb6c38e30723909c492b4d47eaaf4884dbb7aa82053e7cda6c22ee1aa16fc5ba266e272d98ff772c5079d -EBUILD rocm-comgr-5.1.3-r3.ebuild 2051 BLAKE2B c3133953c1b8a9e216012ec63d22dcd1bfd9d70bcead694fad13ede77c79814b86cc6c808a0a56fec9ee70d36c3c15f136770b9ffffe04c7d960160156ba8825 SHA512 eb7742f31064abb964a1447bc6f4ad07872b9cdc5279b7fbdeb3062eb8b641c98b9050ec113d47885a3abc9768cc5cab4a5598459751bd46d970678807772f72 -EBUILD rocm-comgr-5.3.3-r2.ebuild 1943 BLAKE2B fb20250cb7fa79ee706b35b9d2d18962179592625f33076875b73b220773091cb629f59d6af5c264edc83c3dca20606507198fc59be48509fb3feeb3f7c70716 SHA512 dd43457ab7aef2fc2b81dc4d142ecd5f2489da33290e0e583cadc208159c5ea412d1cf9455d04367b7591591a356d16e3239080d0a7bd44ebf4d9a3e57a65fd5 -EBUILD rocm-comgr-5.4.3-r1.ebuild 1892 BLAKE2B 0f92e385b4cfb5e6f98c3921646efb8ac24143d91998ab68058514052d3794197b4dcad0982ee6dbe554ef796d26abb9848a504b38447f7c11494b4fc52172f3 SHA512 0824c07d6d424ab71f70952729a319a8e8605d755004594e3dda91b063275a58c7d870187d1f4d43af0d0c884dacea92b456174f193e5ad94d3d3b00b8c6f86f -EBUILD rocm-comgr-5.5.1.ebuild 2022 BLAKE2B 38cadb6763e798bca799f098b2c4809cc91fcae73d713294036ed9be3f44577e62611035eaf0c1aa9b56027c5cc88cf1bafb2d7e922852c14fd1f762657602c0 SHA512 9eafcc5a17f74936adf29c1050f680f23bbec29f8f4f93bda4914ef6ab2a4aa94229a53ff2ffb61ab56e99f55381ea31ce0dff5129a7a2dee95b30e47cc6c4bd -EBUILD rocm-comgr-5.7.1.ebuild 2027 BLAKE2B 437bdde0cc68f29c920d7d98731f3c816960039f33dd0e8e5f37a0e063495112394ea8e6d0feff294bb866cf0d5d259c6344280f058f01c5ea6300f6ae70afbd SHA512 d49a7564b5a549a7784db274f5a17463a006ec08dbc32fee365bb56e3dd1c5b90b5643463910209a65a09d0d99f56a53e233b6d394a7c5da3b06e45a4e1b3a1f +EBUILD rocm-comgr-5.7.1.ebuild 2059 BLAKE2B a366eb8aab05055bd05c520551d1e3c6670f1330283730a9656c7f02b49543be812af2797c2bdae2c7fae143a203a28563b8dc34a24c481024ee27ce70bbd752 SHA512 f80ba6b4241fc972d7efe2611ecc705145a14d6254a80a19e416d43a7c5b17b7f35492f288665c370143ef7aa28f70eaeb394d20897e44d8ad3ad1d0e8232b3f EBUILD rocm-comgr-6.1.1.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a EBUILD rocm-comgr-6.1.2.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a -EBUILD rocm-comgr-6.3.0.ebuild 2418 BLAKE2B 4111a7c233343f694f7c726e02ea37f8be293955804fce29d626889224437198a8cc4e7eec1728af2bcb0e700df113b09a1902e7279ceff9831f443b9d4f7db5 SHA512 e6a4dfd1163ebcce5106c0b3ae1bb536f34741e74ec91f4584dc6d02e9c8bf293229f3fa653169663667b292a9f42f4792795e6c151018c9b19ab17ad6e8275f -EBUILD rocm-comgr-6.3.2.ebuild 2420 BLAKE2B 42bc47265e2bcaf1b1751cbc6c79e5f51fd6144d4f2f939fcb9f04018dec480bf51ad9a1c645b1f407be5c7b1dd2966591821fcd8c245fa7954fbf02bcd2ce2a SHA512 86382e313aedcbafada922095cb710de46d50f62733f6f5a86a407d47918ba0946470c9703946b4a139095c3e69034ff5b79910a3fc6dbb3947d3e843f81b4ea +EBUILD rocm-comgr-6.3.2-r1.ebuild 2499 BLAKE2B e4a6e306f6c1a3a47f4392e030ba9e88f6c1bf5a3946c5781145a50df7caf0e98c58f12340dd6cbfbec44dc6ee68c018768b8c5be190660fbe6069dff27fa703 SHA512 34c569412644f7482d282ed9c10a62038584f0c7c97a07932be34808bfad2964ddad2fda10a91fa798007b8c4e9dad73ccc1761fa78e33857d7301277f40a39c MISC metadata.xml 638 BLAKE2B d2396daa1a9e505ff3fc3b7a2465f4ca5c933ac8609c08732513c30ebb715f244681075b8b415b75a0d0c330144cb6fab483e6b4231b1144c3bf3bc5091693f3 SHA512 da41a365f6d75e8feabed3a54ca117a8406cabec215137751280ab5985ab86e178a14183e804af220b49b83d4084489c1ec1dd1d543aaa585d910b6636b866c4 diff --git a/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch b/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch deleted file mode 100644 index 8200d4414f8b..000000000000 --- a/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch +++ /dev/null @@ -1,66 +0,0 @@ -From be2bcaaea228cdcb5981b261046175275c402fb9 Mon Sep 17 00:00:00 2001 -From: Konstantin Zhuravlyov <kzhuravl_dev@outlook.com> -Date: Wed, 26 Jan 2022 12:02:52 -0500 -Subject: [PATCH] COMGR changes needed for - https://github.com/llvm/llvm-project/commit/83d59e05b201760e3f364ff6316301d347cbad95 - -Change-Id: Iac01d024463865734879faf5f814e0862c26f7a1 ---- - lib/comgr/src/comgr-compiler.cpp | 3 ++- - lib/comgr/src/comgr-env.h | 1 + - lib/comgr/src/comgr-objdump.cpp | 4 +++- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index 6c2cba2..db4c8d5 100644 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -605,7 +605,8 @@ static amd_comgr_status_t linkWithLLD(llvm::ArrayRef<const char *> Args, - ArrayRef<const char *> ArgRefs = llvm::makeArrayRef(LLDArgs); - static std::mutex MScreen; - MScreen.lock(); -- bool LLDRet = lld::elf::link(ArgRefs, false, LogS, LogE); -+ bool LLDRet = lld::elf::link(ArgRefs, LogS, LogE, false, false); -+ lld::CommonLinkerContext::destroy(); - MScreen.unlock(); - if (!LLDRet) { - return AMD_COMGR_STATUS_ERROR; -diff --git a/lib/comgr/src/comgr-env.h b/lib/comgr/src/comgr-env.h -index eb13e61..aef57b3 100644 ---- a/src/comgr-env.h -+++ b/src/comgr-env.h -@@ -36,6 +36,7 @@ - #ifndef COMGR_ENV_H - #define COMGR_ENV_H - -+#include "llvm/ADT/Optional.h" - #include "llvm/ADT/StringRef.h" - - namespace COMGR { -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 094bbac..b41e6c1 100644 ---- a/src/comgr-objdump.cpp -+++ b/src/comgr-objdump.cpp -@@ -43,6 +43,7 @@ - #include "llvm/ADT/STLExtras.h" - #include "llvm/ADT/StringExtras.h" - #include "llvm/ADT/Triple.h" -+#include "llvm/CodeGen/CommandFlags.h" - #include "llvm/DebugInfo/DWARF/DWARFContext.h" - #include "llvm/DebugInfo/Symbolize/Symbolize.h" - #include "llvm/MC/MCAsmInfo.h" -@@ -2395,9 +2396,10 @@ llvm::DisassemHelper::disassembleAction(StringRef Input, - size_t ArgC = ArgV.size(); - ArgV.push_back(nullptr); - COMGR::clearLLVMOptions(); -+ llvm::codegen::RegisterCodeGenFlags CGF; - cl::ParseCommandLineOptions(ArgC, ArgV.data(), "llvm object file dumper\n", - &ErrS); -- MCPU = lld::getCPUStr(); -+ MCPU = llvm::codegen::getCPUStr(); - - ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr = - MemoryBuffer::getMemBuffer(Input); --- -2.35.1 - diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch deleted file mode 100644 index 13cff2e52dfe..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/25 - -From c65cba2e73f9118e128b9ab7e655ee0f8a7798e7 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Sun, 1 Mar 2020 19:24:22 -0500 -Subject: [PATCH] Link additional required LLVM libraries - -Without these additional required dependencies, linking fails with errors such as: -`undefined reference to llvm::errs()'` ---- - CMakeLists.txt | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1794a07..c7b852a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,7 +207,11 @@ install(FILES - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") - - set(CLANG_LIBS -- clangFrontendTool) -+ clangFrontendTool -+ clangFrontend -+ clangBasic -+ clangDriver -+ clangSerialization) - - set(LLD_LIBS - lldELF -@@ -218,8 +222,21 @@ if (LLVM_LINK_LLVM_DYLIB) - else() - llvm_map_components_to_libnames(LLVM_LIBS - ${LLVM_TARGETS_TO_BUILD} -+ Option - DebugInfoDWARF -- Symbolize) -+ Symbolize -+ Support -+ Object -+ BitWriter -+ MC -+ MCParser -+ MCDisassembler -+ Core -+ IRReader -+ CodeGen -+ Linker -+ Demangle -+ BinaryFormat) - endif() - - target_link_libraries(amd_comgr diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch deleted file mode 100644 index 6bf47c610dfc..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: comgr/src/comgr-env.h -=================================================================== ---- comgr.orig/src/comgr-env.h -+++ comgr/src/comgr-env.h -@@ -37,6 +37,7 @@ - #define COMGR_ENV_H - - #include "llvm/ADT/StringRef.h" -+#include "llvm/ADT/Optional.h" - - namespace COMGR { - namespace env { diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch deleted file mode 100644 index 0e2a9a668216..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: comgr/CMakeLists.txt -=================================================================== ---- comgr.orig/CMakeLists.txt -+++ comgr/CMakeLists.txt -@@ -283,11 +283,7 @@ install(FILES - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") - - set(CLANG_LIBS -- clangFrontendTool -- clangFrontend -- clangBasic -- clangDriver -- clangSerialization) -+ clang-cpp) - - set(LLD_LIBS - lldELF diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed deleted file mode 100644 index 545b1c632182..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -453,7 +453,7 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts, - std::unique_ptr<MCCodeEmitter> MCE; - std::unique_ptr<MCAsmBackend> MAB; - if (Opts.ShowEncoding) { -- MCE.reset(TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx)); -+ MCE.reset(TheTarget->createMCCodeEmitter(*MCII, Ctx)); - MCTargetOptions Options; - MAB.reset(TheTarget->createMCAsmBackend(*STI, *MRI, Options)); - } -@@ -472,7 +472,7 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts, - Out = BOS.get(); - } - -- MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx); -+ MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, Ctx); - MCTargetOptions Options; - MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*STI, *MRI, Options); - Triple T(Opts.Triple); diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu deleted file mode 100644 index 41e51a407ba9..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -244,13 +244,12 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts, - OPT_compress_debug_sections_EQ)) { - if (A->getOption().getID() == OPT_compress_debug_sections) { - // TODO: be more clever about the compression type auto-detection -- Opts.CompressDebugSections = llvm::DebugCompressionType::GNU; -+ Opts.CompressDebugSections = llvm::DebugCompressionType::Z; - } else { - Opts.CompressDebugSections = - llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue()) - .Case("none", llvm::DebugCompressionType::None) - .Case("zlib", llvm::DebugCompressionType::Z) -- .Case("zlib-gnu", llvm::DebugCompressionType::GNU) - .Default(llvm::DebugCompressionType::None); - } - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch deleted file mode 100644 index 54b98726026f..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch +++ /dev/null @@ -1,15 +0,0 @@ -ROCM and HIPIncludePath is now /usr, which disturb the include order -=================================================================== ---- comgr.orig/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -1010,10 +1010,6 @@ amd_comgr_status_t AMDGPUCompiler::addCo - Args.push_back("x86_64-unknown-linux-gnu"); - Args.push_back("--cuda-device-only"); - Args.push_back("-nogpulib"); -- Args.push_back("-isystem"); -- Args.push_back(ROCMIncludePath.c_str()); -- Args.push_back("-isystem"); -- Args.push_back(HIPIncludePath.c_str()); - break; - default: - return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT; diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch deleted file mode 100644 index 08a40460c762..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -Vanilla LLVM does not support calling AMDGPU_KERNEL across different sources/bitcodes. -Without this patch https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/45 occurs. -Reference: https://github.com/llvm/llvm-project/issues/60313 -=================================================================== ---- comgr.orig/test/source1.cl -+++ comgr/test/source1.cl -@@ -35,7 +35,9 @@ - - #include "include-a.h" - -+void kernel source3(__global int *j) { *j = FOO; } -+ - void kernel source1(__global int *j) { - *j += 2; -- source2(j); -+ source3(j); - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch deleted file mode 100644 index c8d078ee8946..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch +++ /dev/null @@ -1,14 +0,0 @@ -This add -fno-stack-protector to all compilation, since -f-stack-protector is currently unsupported by ROCm -Reference: https://bugs.gentoo.org/890377 -index 465187e..0baf925 100644 ---- a/src/comgr-compiler.cpp -+++ b/src/comgr-compiler.cpp -@@ -850,6 +850,8 @@ amd_comgr_status_t AMDGPUCompiler::processFile(const char *InputFilePath, - Argv.push_back(Arg); - } - -+ Argv.push_back("-fno-stack-protector"); -+ - for (auto &Option : ActionInfo->getOptions()) { - Argv.push_back(Option.c_str()); - if (Option.rfind("--rocm-path", 0) == 0) { diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch deleted file mode 100644 index 1346ba4ef04d..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f -Reference: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/52 -Reference: https://bugs.gentoo.org/851702#c37 -This unblocks building blender with HIP cycles support -====================================================================== -From 2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f Mon Sep 17 00:00:00 2001 -From: Jacob Lambert <jacob.lambert@amd.com> -Date: Thu, 12 Jan 2023 08:45:38 -0800 -Subject: [PATCH] Remove -h option from comgr-objdump - -The -h option (short for -headers) is a legal objdump option. -However registering this as an LLVM option by Comgr prevents other -LLVM tools or instances from registering a -h option in the same -process, which is an issue because -h is a common short form for --help. - -A long term solution will be to libraryize llvm-obj dump, and -call it in Comgr via an API instead of re-implementation, which -will eliminate the need for Comgr to register any LLVM options for -objdump. - -Change-Id: Ieb1981aeb1826422647fd301c4827e2bfb370560 ---- - lib/comgr/src/comgr-objdump.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 6d20a3c..ead69fe 100644 ---- a/src/comgr-objdump.cpp -+++ b/src/comgr-objdump.cpp -@@ -175,9 +175,9 @@ cl::opt<bool> SectionHeaders("section-headers", - static cl::alias SectionHeadersShort("headers", - cl::desc("Alias for --section-headers"), - cl::aliasopt(SectionHeaders)); --static cl::alias SectionHeadersShorter("h", -- cl::desc("Alias for --section-headers"), -- cl::aliasopt(SectionHeaders)); -+// The following option has been removed to avoid conflicts with -+// other llvm tools/instances also attempting to register a -h option -+// static cl::alias SectionHeadersShorter("h", ...) - - cl::list<std::string> - FilterSections("section", diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch deleted file mode 100644 index 9fd14df196a2..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -Vanilla LLVM does not support calling AMDGPU_KERNEL across different sources/bitcodes. -Without this patch https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/45 occurs. -Reference: https://github.com/llvm/llvm-project/issues/60313 -=================================================================== ---- comgr.orig/test/source/source1.cl -+++ comgr/test/source/source1.cl -@@ -35,7 +35,9 @@ - - #include "include-a.h" - -+void kernel source3(__global int *j) { *j = FOO; } -+ - void kernel source1(__global int *j) { - *j += 2; -- source2(j); -+ source3(j); - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch deleted file mode 100644 index 96df9291eb86..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 271fddf65f43675e675f0cb4e9aaa3d27d34c58a Mon Sep 17 00:00:00 2001 -From: Ron Lieberman <ron.lieberman@amd.com> -Date: Thu, 29 Dec 2022 05:17:41 -0600 -Subject: [PATCH] [llvm merge] add include of lld/Common/CommonLinkerContext.h - -Change-Id: I5767b4c1e683e9df9146804ba23ef3c0c0b6c07a ---- - lib/comgr/src/comgr-compiler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index 2a7362a..bb1c9d3 100644 ---- comgr/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -39,6 +39,7 @@ - #include "comgr-compiler.h" - #include "comgr-device-libs.h" - #include "comgr-env.h" -+#include "lld/Common/CommonLinkerContext.h" - #include "lld/Common/Driver.h" - #include "clang/Basic/Version.h" - #include "clang/CodeGen/CodeGenAction.h" diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch deleted file mode 100644 index 8bb07b55a3ab..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e1da67c6acb2b0e4a8f9c05c89e3778252ea5aa7 Mon Sep 17 00:00:00 2001 -From: Ron Lieberman <ron.lieberman@amd.com> -Date: Sat, 17 Dec 2022 19:58:26 -0600 -Subject: [PATCH] None -> std::nullopt - -Change-Id: I1cc241aa47de538f9f5b1c12cb5655aca8a4502f ---- - lib/comgr/src/comgr-env.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/comgr/src/comgr-env.cpp b/lib/comgr/src/comgr-env.cpp -index 742f4d4..6ab6f0f 100644 ---- comgr/src/comgr-env.cpp -+++ comgr/src/comgr-env.cpp -@@ -53,7 +53,7 @@ bool shouldSaveTemps() { - Optional<StringRef> getRedirectLogs() { - static char *RedirectLogs = getenv("AMD_COMGR_REDIRECT_LOGS"); - if (!RedirectLogs || StringRef(RedirectLogs) == "0") { -- return None; -+ return std::nullopt; - } - return StringRef(RedirectLogs); - } diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch deleted file mode 100644 index aa3e7c370a53..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b582dfb33fdb51065c22800fe02dd83207185664 Mon Sep 17 00:00:00 2001 -From: Ron Lieberman <ron.lieberman@amd.com> -Date: Sun, 1 Jan 2023 10:35:49 -0600 -Subject: [PATCH] [llvm] move to inverted OPT_mrelax_relocations_no - -Change-Id: I95e48e8acf5b9124d25e5e7b86c418f1a0d9389d ---- - lib/comgr/src/comgr-compiler.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp -index bb1c9d3..95c1bb4 100644 ---- comgr/src/comgr-compiler.cpp -+++ comgr/src/comgr-compiler.cpp -@@ -259,7 +259,7 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts, - } - } - -- Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations); -+ Opts.RelaxELFRelocations = !Args.hasArg(OPT_mrelax_relocations_no); - Opts.DwarfVersion = getLastArgIntValue(Args, OPT_dwarf_version_EQ, 2, Diags); - Opts.DwarfDebugFlags = - std::string(Args.getLastArgValue(OPT_dwarf_debug_flags)); diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch deleted file mode 100644 index 340df3852fc2..000000000000 --- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 48c682d577a7955256d0bfac5d497b3feebff11c Mon Sep 17 00:00:00 2001 -From: Ron Lieberman <ron.lieberman@amd.com> -Date: Mon, 16 Jan 2023 14:29:05 -0600 -Subject: [PATCH] [llvm merge] Move to Expected on SubtargetFeatures - -Change-Id: I060ceaa2b51eaa6ed1b472ea42c6788b98001088 ---- - lib/comgr/src/comgr-objdump.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp -index 86a5d7f..6d20a3c 100644 ---- comgr/src/comgr-objdump.cpp -+++ comgr/src/comgr-objdump.cpp -@@ -1270,7 +1270,10 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj, - const Target *TheTarget = getTarget(Obj); - - // Package up features to be passed to target/subtarget -- SubtargetFeatures Features = Obj->getFeatures(); -+ Expected<SubtargetFeatures> FeaturesValue = Obj->getFeatures(); -+ if (!FeaturesValue) -+ WithColor::error(errs(), ToolName) << FeaturesValue.takeError(); -+ SubtargetFeatures Features = *FeaturesValue; - std::vector<std::string> MAttrs = lld::getMAttrs(); - if (MAttrs.size()) { - for (unsigned I = 0; I != MAttrs.size(); ++I) { diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild deleted file mode 100644 index 3339e71dc276..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -PATCHES=( - "${FILESDIR}/${PN}-4.5.2-dependencies.patch" - "${FILESDIR}/${PN}-5.1.3-Find-CLANG_RESOURCE_DIR.patch" - "${FILESDIR}/${PN}-5.1.3-clang-link.patch" - "${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-COMGR-changes-needed-for-upstream-llvm.patch" - "${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu" - "${FILESDIR}/${PN}-5.1.3-llvm-15-args-changed" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/clang-runtime:= - llvm-core/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die - sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild deleted file mode 100644 index 30112cb3b0c6..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu" - "${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.3.3-remove-h-option.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/clang-runtime:= - llvm-core/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild deleted file mode 100644 index 7863223f7e6a..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=15 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch" - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.3.3-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.3.3-remove-h-option.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/clang-runtime:= - llvm-core/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild deleted file mode 100644 index 77c1f229941c..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake llvm prefix - -LLVM_MAX_SLOT=16 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-5.3.3-HIPIncludePath-not-needed.patch" - "${FILESDIR}/${PN}-5.5.1-fix-tests.patch" - "${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch" - "${FILESDIR}/${PN}-5.3.3-remove-h-option.patch" - "${FILESDIR}/${PN}-5.5.1-nullopt.patch" - "${FILESDIR}/${PN}-5.5.1-opt_mrelax.patch" - "${FILESDIR}/${PN}-5.5.1-lld-include.patch" - "${FILESDIR}/${PN}-5.5.1-subtargetfeatures.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-core/clang:${LLVM_MAX_SLOT}= - llvm-core/clang-runtime:= - llvm-core/lld:${LLVM_MAX_SLOT}=" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild index 15b9eeb38273..51d6b5c419b1 100644 --- a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild +++ b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,7 +38,9 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" -RDEPEND=">=dev-libs/rocm-device-libs-${PV} +RDEPEND=" + >=dev-libs/rocm-device-libs-${PV} + <dev-libs/rocm-device-libs-6 llvm-core/clang:${LLVM_MAX_SLOT}= llvm-core/clang-runtime:= llvm-core/lld:${LLVM_MAX_SLOT}=" diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild deleted file mode 100644 index 66239d28f79c..000000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( 19 ) - -inherit cmake llvm-r1 prefix - -MY_P=llvm-project-rocm-${PV} -components=( "amd/comgr" ) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/ROCm/llvm-project/tree/amd-staging/amd/comgr" -SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}/${components[0]}" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" - "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" - "${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch" - "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" - "${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch" - "${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch" -) - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - llvm-core/clang-runtime:= - $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT}= - llvm-core/lld:${LLVM_SLOT}= - ') - dev-util/hipcc:${SLOT} -" -DEPEND="${RDEPEND}" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_fetch - git-r3_checkout '' . '' "${components[@]}" - else - archive="${MY_P}.tar.gz" - ebegin "Unpacking from ${archive}" - tar -x -z -o \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/${MY_P}/}" || die - eend ${?} - fi -} - -src_prepare() { - sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die - sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch) - - cmake_src_prepare - - # Replace @CLANG_RESOURCE_DIR@ in patches - local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)" - sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="$(get_llvm_prefix)" - -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35 - ) - cmake_src_test -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild index bf8986261a9f..cea4ebe78e73 100644 --- a/dev-libs/rocm-comgr/rocm-comgr-6.3.2.ebuild +++ b/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild @@ -26,14 +26,14 @@ PATCHES=( "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" "${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch" "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch" - "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch" "${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch" "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch" "${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch" "${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch" ) -RDEPEND=">=dev-libs/rocm-device-libs-${PV} +RDEPEND=" + dev-libs/rocm-device-libs:${SLOT} llvm-core/clang-runtime:= $(llvm_gen_dep ' llvm-core/clang:${LLVM_SLOT}= @@ -77,6 +77,8 @@ src_configure() { -DCMAKE_STRIP="" # disable stripping defined at lib/comgr/CMakeLists.txt:58 -DBUILD_TESTING=$(usex test ON OFF) ) + # Prevent CMake from finding systemwide hip, which breaks tests + use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_hip=ON ) cmake_src_configure } |