Merge ~slavik81/ubuntu/+source/glibc:fix-rocm-hipamd-ftbfs into ubuntu/+source/glibc:ubuntu/devel

[Cory Bloor]

Add d/p/arm/lp2032624-amdgpu.patch to disable SVE vector types on aarch64 when __HIP_DEVICE_COMPILE__ is set, as this macro is provided by clang to indicates that the code is being built for the GPU, rather than for the CPU. SVE vector types are not available on the GPU.

The rocm-hipamd library and its rdepends FTBFS due to the addition of these vector types in glibc 2.38 (LP2032624). This patch should fix that problem (at least for rocm-hipamd).

[Graham Inggs (ginggs)]

Based on comment 22 in LP: #2032624, I am marking this merge request 'Needs information'.

review: Needs Information

Unmerged commits

abd2e5d... by Cordell Bloor <email address hidden> on 2024-04-10

Add d/p/arm/lp2032624-amdgpu.patch

77acb46... by Steve Langasek on 2024-03-30

2.39-0ubuntu8 (patches unapplied)

Imported using git-ubuntu import.

98e2cd6... by Simon Chopin on 2024-03-28

2.39-0ubuntu7 (patches unapplied)

Imported using git-ubuntu import.

1d32794... by Michael Hudson-Doyle on 2024-03-13

2.39-0ubuntu6 (patches unapplied)

Imported using git-ubuntu import.

3a50c8e... by Michael Hudson-Doyle on 2024-03-01

2.39-0ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

7b1e928... by Steve Langasek on 2024-02-29

2.39-0ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

c2757e3... by Steve Langasek on 2024-02-29

2.39-0ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

deea0d4... by Julian Andres Klode on 2024-02-22

2.39-0ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

335d2ee... by Simon Chopin on 2024-02-01

2.39-0ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

e84c7dd... by Simon Chopin on 2023-10-23

2.38-3ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/patches/arm/lp2032624-amdgpu.patch b/debian/patches/arm/lp2032624-amdgpu.patch
new file mode 100644
index 0000000..ce72d8a
--- /dev/null
+++ b/debian/patches/arm/lp2032624-amdgpu.patch
@@ -0,0 +1,30 @@
+From: Cordell Bloor <[e-mail]>
+Date: Wed, 10 Apr 2024 16:49:24 -0600
+Subject: [PATCH] arm64/math-vec.h: drop SVE vector types in device code
+
+These headers get included when building HIP libraries on the aarch64
+platform. The headers are used when building both CPU code and GPU
+code, but the SVE vector types are not supported on the GPU.
+
+The clang compiler sets __HIP_DEVICE_COMPILE__ when it is building
+code for the GPU, so disable __SVE_VEC_MATH_SUPPORTED when that macro
+is detected.
+
+Bug-Ubuntu: https://bugs.launchpad.net/glibc/+bug/2032624
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30909
+Forwarded: No
+
+Index: glibc/sysdeps/aarch64/fpu/bits/math-vector.h
+===================================================================
+--- glibc.orig/sysdeps/aarch64/fpu/bits/math-vector.h
++++ glibc/sysdeps/aarch64/fpu/bits/math-vector.h
+@@ -101,7 +101,8 @@ typedef __attribute__ ((__neon_vector_ty
+ typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t;
+ #endif
+ 
+-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)
++#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) \
++  && !defined(__HIP_DEVICE_COMPILE__)
+ #  define __SVE_VEC_MATH_SUPPORTED
+ typedef __SVFloat32_t __sv_f32_t;
+ typedef __SVFloat64_t __sv_f64_t;
diff --git a/debian/patches/series b/debian/patches/series
index 24d7df1..696d833 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@ arm/local-sigaction.diff
 arm/local-vfp-sysdeps.diff
 arm/unsubmitted-ldso-multilib.diff
 arm/local-arm-futex.diff
+arm/lp2032624-amdgpu.patch
 
 hppa/local-inlining.diff