Your message dated Mon, 11 Nov 2024 21:20:33 +0000
with message-id <e1tabpp-003gnf...@fasolo.debian.org>
and subject line Bug#1087280: fixed in llvm-toolchain-19 1:19.1.3-2
has caused the Debian Bug report #1087280,
regarding llvm-toolchain-19: Please re-enable OpenMP (without offloading) on 
riscv64 (and mips64el and loong64)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
1087280: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087280
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: llvm-toolchain-19
Version: 1:19.1.3-1
Severity: important
Tags: patch
X-Debbugs-Cc: debian-ri...@lists.debian.org, debian-m...@lists.debian.org, 
debian-loonga...@lists.debian.org
User: debian-ri...@lists.debian.org
Usertags: riscv64

Dear maintainer,

Upstream LLVM has two levels of support for OpenMP, either with or
without offloading. The debian package currently enables offloading
unconditionally on all architectures supporting OpenMP.

Up to upstream version 18, it was possible to build the offloading
support even without host offloading support, but following the upstream
move of the libomptarget code to the offload subproject this is not
possible anymore, causing an FTBFS on architectures not supporting
offloading. As a consequence OpenMP has been purely disabled on
loong64, mips64el and riscv64. This causes some packages to FTBFS on
those architectures.

I believe the right way to do that is to re-enable OpenMP, while keeping
offloading disabled on those architectures. This is what the patch below
does. I have tested it successfully on riscv64, but not on mips64el nor
loong64.

Regards
Aurelien


--- llvm-toolchain-19-19.1.3/debian/control
+++ llvm-toolchain-19-19.1.3/debian/control
@@ -623,7 +623,7 @@
 
 Package: libomp-19-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64
+Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64 loong64 mips64el 
riscv64
 Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-19-doc
 Breaks: libiomp-dev (<< 3.7-1)
@@ -637,7 +637,7 @@
 
 Package: libomp5-19
 Multi-Arch: same
-Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64
+Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64 loong64 mips64el 
riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
diff -Nru llvm-toolchain-19-19.1.3/debian/libomp5-X.Y.install.in 
llvm-toolchain-19-19.1.3/debian/libomp5-X.Y.install.in
--- llvm-toolchain-19-19.1.3/debian/libomp5-X.Y.install.in      2024-10-15 
15:10:06.000000000 +0200
+++ llvm-toolchain-19-19.1.3/debian/libomp5-X.Y.install.in      2024-11-09 
18:02:58.000000000 +0100
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
 
 usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5
-[amd64 hurd-amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] 
usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
+[amd64 hurd-amd64 arm64 ppc64el ppc64] 
usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@.@LLVM_VERSION_MINOR@
 
--- llvm-toolchain-19-19.1.3/debian/libomp-X.Y-dev.install.in
+++ llvm-toolchain-19-19.1.3/debian/libomp-X.Y-dev.install.in
@@ -7,16 +7,16 @@
 [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a
 [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so
 
-[amd64 hurd-amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] 
/usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
+[amd64 hurd-amd64 ppc64el arm64 ppc64] 
/usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a
 
-[amd64 hurd-amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] 
/usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
+[amd64 hurd-amd64 ppc64el arm64 ppc64] 
/usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
 
 usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
 
-[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] 
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
-[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] 
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
+[amd64 hurd-amd64 arm64 ppc64el ppc64] 
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
+[amd64 hurd-amd64 arm64 ppc64el ppc64] 
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay
 
-[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] 
usr/bin/llvm-omp-device-info-@LLVM_VERSION@
-[amd64 hurd-amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] 
usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
+[amd64 hurd-amd64 arm64 ppc64el ppc64] 
usr/bin/llvm-omp-device-info-@LLVM_VERSION@
+[amd64 hurd-amd64 arm64 ppc64el ppc64] 
usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@
 
 [!armhf !hurd-amd64] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/
--- llvm-toolchain-19-19.1.3/debian/rules
+++ llvm-toolchain-19-19.1.3/debian/rules
@@ -423,12 +423,16 @@
 endif
 
 # Enable openmp (or not)
-OMP_ARCHS = amd64 arm64 armhf ppc64 ppc64el hurd-amd64
+OMP_OFFLOAD_ARCHS = amd64 arm64 armhf ppc64 ppc64el hurd-amd64
+OMP_ARCHS = $(OMP_OFFLOAD_ARCHS) loong64 mips64el riscv64
 OPENMP_ENABLE=yes
 ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS)))
   OPENMP_ENABLE=no
 else
-  RUNTIMES += ;openmp;offload
+  RUNTIMES += ;openmp
+  ifneq (,$(filter $(DEB_HOST_ARCH), $(OMP_OFFLOAD_ARCHS)))
+      RUNTIMES += ;offload
+  endif
   STAGE_ALL_CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-lm"
 ifeq ($(LIBUNWIND_ENABLE),yes)
   STAGE_ALL_CMAKE_EXTRA += -DOPENMP_USE_LLVM_UNWINDER=ON

--- End Message ---
--- Begin Message ---
Source: llvm-toolchain-19
Source-Version: 1:19.1.3-2
Done: Sylvestre Ledru <sylves...@debian.org>

We believe that the bug you reported is fixed in the latest version of
llvm-toolchain-19, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1087...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sylvestre Ledru <sylves...@debian.org> (supplier of updated llvm-toolchain-19 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 11 Nov 2024 12:45:14 +0100
Source: llvm-toolchain-19
Architecture: source
Version: 1:19.1.3-2
Distribution: unstable
Urgency: medium
Maintainer: LLVM Packaging Team <pkg-llvm-t...@lists.alioth.debian.org>
Changed-By: Sylvestre Ledru <sylves...@debian.org>
Closes: 1087280
Changes:
 llvm-toolchain-19 (1:19.1.3-2) unstable; urgency=medium
 .
   * enable OpenMP (without offloading) on riscv64 (and mips64el and loong64)
     Thanks to Aurélien Jarno for this patch
     (Closes: #1087280)
Checksums-Sha1:
 337bf65d8875daad551d585d3fbe4031bf63a948 7996 llvm-toolchain-19_19.1.3-2.dsc
 2bb88336723c11ac82c0c6854fd0bb36c0d2da51 154344 
llvm-toolchain-19_19.1.3-2.debian.tar.xz
 d9cdab6c7a05f729e53ec07b1a433bbde510cf86 12676 
llvm-toolchain-19_19.1.3-2_source.buildinfo
Checksums-Sha256:
 14c0974acb4789c10c6dd7d540c31b4bcc0ecedf1538bb4bd56e3a536d8af832 7996 
llvm-toolchain-19_19.1.3-2.dsc
 b1338d8623bd479b0b8cb28db85c8124f43dacd1407cb296e8be861710841e12 154344 
llvm-toolchain-19_19.1.3-2.debian.tar.xz
 768dcc7ad49c9a39ac47830dccd6ae8a3695a136077c76e44834fcf1e345908a 12676 
llvm-toolchain-19_19.1.3-2_source.buildinfo
Files:
 3e4b785e9b4069debd182f8a16918ac2 7996 devel optional 
llvm-toolchain-19_19.1.3-2.dsc
 74a13442ff220649779585f5b3b962f2 154344 devel optional 
llvm-toolchain-19_19.1.3-2.debian.tar.xz
 48a3b79c7885af255aad326bf0bbd76e 12676 devel optional 
llvm-toolchain-19_19.1.3-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----

iQJJBAEBCgAzFiEEtg21mU05vsTRqVzPfmUo2nUvG+EFAmcybUAVHHN5bHZlc3Ry
ZUBkZWJpYW4ub3JnAAoJEH5lKNp1Lxvh+lEP/32pzmz5v0XWort0TMj1q4xyD+g4
r2pxq0FiSS4XgIokGcJ3MbeMrgwsAvDtWtTob1oR5G9fIEq/Zb0Di5JDRT9vn2ai
WNXScz7apXOZVhx6yqs7VL8dNNmmJvAv2yaQaPyomJOSgZYsqkzx19p+cR2laq97
GVsShy0URlLUKydjH0wOOJg9U5MRfa92rtLmJeLCW3oqEPmwS0QuTE+Ict0WnNnX
L8PCnKxRh+sgTs4p9WotBUNuRycrQD5Nh3Gy9cCr0+QMuWTpUwmc9WW8p2yf+Hu6
2n36bBKs02fhpBacOWSvyzulVzwVTPMrYpYQDBRagNRqdwwfBQPWH+3BlZt+QDn7
OsTC1e9wS6iB56/ZXEpRw9es2zOYb20T2gBfVGDZIepQU8ZhPvMwntAGw5whqktW
usBNISPnFFZ4tLQeG9YnsnQq1+uOnT4YLPVMW1SHdl/suw7hk0onfpeYjFIQF0r8
4jZs6zup+anhPzVjAJhhaGfBfCfYH8in2Gn/mUseIi24ZzFo587wrMs8x68MOF/o
Yq6ffy0QJwiMJfjdgma6QDYDRBKjHQghQh8hDrAaiBMGREV6Qvym+oNWMoNo2B+K
0YRfXHvJWlXvqAIZgZNx4eSSeCbqeeBm6Ap8eI8J97ur/NK+nX4gGfZrkCykFDYS
p8k5vOMsppGyo+G0
=ZX89
-----END PGP SIGNATURE-----

Attachment: pgpbIzLhLjEbC.pgp
Description: PGP signature


--- End Message ---

Reply via email to