commit: 6d019ee6f384e80ba61a74c429a654a96d0b09ec
Author: Jack de Kleuver <jackdekleuver <AT> gmail <DOT> com>
AuthorDate: Sat Nov 5 07:13:32 2022 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 11:50:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d019ee6
dev-libs/rocm-comgr: Bump LLVM version to 15
patch files to work with new compiler version
Signed-off-by: Jack de Kleuver <jackdekleuver <AT> gmail.com>
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
.../files/rocm-comgr-5.1.3-llvm-15-args-changed | 20 ++++++++++++++++++++
.../files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu | 17 +++++++++++++++++
...gr-5.1.3-r1.ebuild => rocm-comgr-5.1.3-r2.ebuild} | 4 +++-
3 files changed, 40 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..545b1c632182
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..41e51a407ba9
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu
@@ -0,0 +1,17 @@
+--- 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/rocm-comgr-5.1.3-r1.ebuild
b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r2.ebuild
similarity index 94%
rename from dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild
rename to dev-libs/rocm-comgr/rocm-comgr-5.1.3-r2.ebuild
index 0674badac939..b080235a4798 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r1.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
inherit cmake llvm prefix
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/";
@@ -24,6 +24,8 @@ PATCHES=(
"${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"
)
DESCRIPTION="Radeon Open Compute Code Object Manager"
