Fix disabling amdgpu on non-Linux

This commit is contained in:
Samuel Thibault 2023-01-31 23:19:06 +01:00
parent 9fb73635a7
commit 86944b9db1
3 changed files with 25 additions and 0 deletions

3
debian/changelog vendored
View File

@ -7,6 +7,9 @@ llvm-toolchain-15 (1:15.0.7-2) UNRELEASED; urgency=medium
* Update print lldb python patch, following what was done
in automake for newer python
[ Samuel Thibault ]
* Fix disabling amdgpu on non-Linux.
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 15 Jan 2023 10:54:41 +0100
llvm-toolchain-15 (1:15.0.7-1) unstable; urgency=medium

20
debian/patches/amdgpu-nonlinux.patch vendored Normal file
View File

@ -0,0 +1,20 @@
https://reviews.llvm.org/D143017
[Libomptarget] Fix disabling amdgpu on non-Linux.
Previously, on non-Linux, amdgpu would get enabled whatever the CPU
architecture.
Index: llvm-toolchain-15-15.0.7/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
===================================================================
--- llvm-toolchain-15-15.0.7.orig/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
+++ llvm-toolchain-15-15.0.7/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
@@ -27,7 +27,7 @@ if(NOT LIBOMPTARGET_DEP_LIBELF_FOUND)
return()
endif()
-if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
libomptarget_say("Not building AMDGPU plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts")
return()
endif()

View File

@ -158,3 +158,5 @@ protobuf_3.21.patch
add-arm-vcmpz-test.patch
fix-mesa-build.patch
link-grpc.diff
amdgpu-nonlinux.patch