Update glibc patch set to latest master-epic.

johnny-mnemonic · Oct 4, 2024 · 0fb5752 · 0fb5752
1 parent 135e596
commit 0fb5752
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/config/t2/package/base/glibc/0009-ia64-Qualify-u-and-bits-with-__-prefix.patch b/config/t2/package/base/glibc/0009-ia64-Qualify-u-and-bits-with-__-prefix.patch
@@ -0,0 +1,43 @@
+From f2d4c23fc7bbf6f3b530f2139bc8ae70f8fac328 Mon Sep 17 00:00:00 2001
+From: Johnny Mnemonic <jm@machine-hall.org>
+Date: Thu, 3 Oct 2024 19:34:09 +0200
+Subject: [PATCH 1/2] ia64: Qualify 'u' and 'bits' with '__' prefix
+
+---
+ sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h | 4 ++--
+ sysdeps/unix/sysv/linux/ia64/sys/ucontext.h    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
+index abc531c5f6..dc73f1202c 100644
+--- a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
++++ b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
+@@ -33,8 +33,8 @@ struct __ia64_fpreg
+   {
+     union
+       {
+-	unsigned long bits[2];
+-      } u;
++	unsigned long __bits[2];
++      } __u;
+   } __attribute__ ((__aligned__ (16)));
+
+ struct sigcontext
+diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h b/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h
+index 40eaee4d46..e890327a04 100644
+--- a/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h
++++ b/sysdeps/unix/sysv/linux/ia64/sys/ucontext.h
+@@ -40,8 +40,8 @@ struct __ia64_fpreg_mcontext
+   {
+     union
+       {
+-	unsigned long __ctx(bits)[2];
+-      } __ctx(u);
++	unsigned long __ctx(__bits)[2];
++      } __ctx(__u);
+   } __attribute__ ((__aligned__ (16)));
+
+ typedef struct
+-- 
+2.25.1
+
diff --git a/...Partial-math-FPU-error-fix-for-ia64.patch → ...Partial-math-FPU-error-fix-for-ia64.patch b/...Partial-math-FPU-error-fix-for-ia64.patch → ...Partial-math-FPU-error-fix-for-ia64.patch
@@ -1,7 +1,7 @@
-From 38bc8ec1778ed2d67920d4a0d6a0f2c72b78ed4a Mon Sep 17 00:00:00 2001
+From 09fbbd63272876a1fd205b6143ecf235d7c726ed Mon Sep 17 00:00:00 2001
 From: Tomas Glozar <tglozar@gmail.com>
 Date: Tue, 17 Oct 2023 20:27:53 +0200
-Subject: [PATCH 9/9] Partial math FPU error fix for ia64
+Subject: [PATCH 2/2] Partial math FPU error fix for ia64
 
 --- T2-COPYRIGHT-NOTE-BEGIN ---
 T2 SDE: package/*/glibc/math-fpu-error-partial-fix.patch.ia64