Skip to content

Commit

Permalink
Update glibc patch set to latest master-epic.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnny-mnemonic committed Dec 5, 2024
1 parent 7ac65a1 commit cfb5d7d
Show file tree
Hide file tree
Showing 12 changed files with 96 additions and 38 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8c3589d35a033280cdd93fa876ade70162810912 Mon Sep 17 00:00:00 2001
From dcd6a18c02bd0b84d541cfb7cb3b347d19b08853 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Wed, 10 Jan 2024 21:08:26 +0100
Subject: [PATCH 1/9] Revert "Remove ia64-linux-gnu"
Subject: [PATCH 01/12] Revert "Remove ia64-linux-gnu"

This reverts commit 460860f457e2a889785c506e8c77d4a7dff24d3e.
---
Expand Down Expand Up @@ -1135,10 +1135,10 @@ index 24e3c8d25b..fdf4ba897d 100644
cross-compiling the GNU C Library, you need to specify
'ARCH=ARCHITECTURE' in the 'make headers_install' command, where
diff --git a/NEWS b/NEWS
index d488874aba..ae21d60026 100644
index 797f4d6cab..15aef90442 100644
--- a/NEWS
+++ b/NEWS
@@ -356,8 +356,6 @@ Deprecated and removed features, and other changes affecting compatibility:
@@ -385,8 +385,6 @@ Deprecated and removed features, and other changes affecting compatibility:
replacement library or its dependencies use dynamic TLS instead of
initial-exec TLS.

Expand Down Expand Up @@ -1198,7 +1198,7 @@ index e3dcb3014b..a840f464fc 100644
// Bug 21635: uc_mcontext has wrong type.
xfail[powerpc32-linux]-element ucontext_t mcontext_t uc_mcontext
diff --git a/elf/cache.c b/elf/cache.c
index 8a618e11fa..baf6845daf 100644
index 62d681df42..34939a4e38 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -179,6 +179,9 @@ print_entry (const char *lib, int flag, uint64_t hwcap,
Expand Down Expand Up @@ -1237,7 +1237,7 @@ index 3e68a3d823..5f3169c40f 100644
headers present in the kernel source directory are not suitable for
direct use by @theglibc{}. You do not need to use that kernel, just have
diff --git a/manual/math.texi b/manual/math.texi
index e4f9122609..65a416b887 100644
index 7f030314d3..de42384196 100644
--- a/manual/math.texi
+++ b/manual/math.texi
@@ -69,7 +69,7 @@ Support for @code{_Float@var{N}} or @code{_Float@var{N}x} types is
Expand All @@ -1263,10 +1263,10 @@ index efb9523e9e..2b00e3781b 100644
# define XFAIL_FLOAT128_PAYLOAD (TEST_COND_binary128 ? XFAIL_TEST : 0)
#else
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 2cb562f8ea..885839cd31 100644
index d9adb5856c..99044292ed 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -150,7 +150,9 @@ __attribute ((always_inline))
@@ -152,7 +152,9 @@ __attribute ((always_inline))
guard_position (void *mem, size_t size, size_t guardsize, struct pthread *pd,
size_t pagesize_m1)
{
Expand All @@ -1277,7 +1277,7 @@ index 2cb562f8ea..885839cd31 100644
return mem;
#elif _STACK_GROWS_UP
return (char *) (((uintptr_t) pd - guardsize) & ~pagesize_m1);
@@ -164,7 +166,7 @@ setup_stack_prot (char *mem, size_t size, char *guard, size_t guardsize,
@@ -166,7 +168,7 @@ setup_stack_prot (char *mem, size_t size, char *guard, size_t guardsize,
const int prot)
{
char *guardend = guard + guardsize;
Expand All @@ -1286,7 +1286,7 @@ index 2cb562f8ea..885839cd31 100644
/* As defined at guard_position, for architectures with downward stack
the guard page is always at start of the allocated area. */
if (__mprotect (guardend, size - guardsize, prot) != 0)
@@ -187,7 +189,7 @@ advise_stack_range (void *mem, size_t size, uintptr_t pd, size_t guardsize)
@@ -189,7 +191,7 @@ advise_stack_range (void *mem, size_t size, uintptr_t pd, size_t guardsize)
{
uintptr_t sp = (uintptr_t) CURRENT_STACK_FRAME;
size_t pagesize_m1 = __getpagesize () - 1;
Expand All @@ -1295,7 +1295,7 @@ index 2cb562f8ea..885839cd31 100644
size_t freesize = (sp - (uintptr_t) mem) & ~pagesize_m1;
assert (freesize < size);
if (freesize > PTHREAD_STACK_MIN)
@@ -508,7 +510,19 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
@@ -510,7 +512,19 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
{
/* The old guard area is too large. */

Expand All @@ -1316,7 +1316,7 @@ index 2cb562f8ea..885839cd31 100644
if (__mprotect ((char *) mem + guardsize, pd->guardsize - guardsize,
prot) != 0)
goto mprot_error;
@@ -585,7 +599,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
@@ -587,7 +601,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
static void
name_stack_maps (struct pthread *pd, bool set)
{
Expand All @@ -1339,10 +1339,10 @@ index b587211f04..47d75fea69 100644
#error "HP_TIMING_NOW missing"
#endif
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 7882d7d6fb..8e3bf5081f 100755
index c53aa8964c..cb4537b814 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -234,6 +234,10 @@ class Context(object):
@@ -231,6 +231,10 @@ class Context(object):
os_name='linux-gnu')
self.add_config(arch='i686',
os_name='gnu')
Expand All @@ -1353,7 +1353,7 @@ index 7882d7d6fb..8e3bf5081f 100755
self.add_config(arch='loongarch64',
os_name='linux-gnu',
variant='lp64d',
@@ -1320,6 +1324,7 @@ def install_linux_headers(policy, cmdlist):
@@ -1314,6 +1318,7 @@ def install_linux_headers(policy, cmdlist):
'i586': 'x86',
'i686': 'x86',
'i786': 'x86',
Expand Down Expand Up @@ -151060,7 +151060,7 @@ index b986898598..88fbec50fd 100644
size_t len = pd->stackblock_size - pd->guardsize;
#elif _STACK_GROWS_UP
diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c
index da496177c9..fcadd01941 100644
index 45bb1dfe4d..c7f2d9d6ea 100644
--- a/sysdeps/unix/sysv/linux/fstatat64.c
+++ b/sysdeps/unix/sysv/linux/fstatat64.c
@@ -86,7 +86,7 @@ fstatat64_time64_stat (int fd, const char *file, struct __stat64_t64 *buf,
Expand All @@ -151073,7 +151073,7 @@ index da496177c9..fcadd01941 100644
r = INTERNAL_SYSCALL_CALL (newfstatat, fd, file, buf, flag);
# elif defined __NR_fstatat64
diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index 230374cb22..5bcc1455d0 100644
index f84be58439..00831fde68 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -45,7 +45,7 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf)
Expand All @@ -151086,7 +151086,7 @@ index 230374cb22..5bcc1455d0 100644
if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
return INLINE_SYSCALL_CALL (fstat, fd, buf);
diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c
index 5255ca05fd..857d868b43 100644
index de4303e594..5f1804d49e 100644
--- a/sysdeps/unix/sysv/linux/fxstatat64.c
+++ b/sysdeps/unix/sysv/linux/fxstatat64.c
@@ -35,7 +35,7 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag)
Expand Down Expand Up @@ -160189,7 +160189,7 @@ index a25cf07e9f..052928c363 100644

#define __ASSUME_CLONE_DEFAULT 1
diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index 16ad8b8211..7993eba06e 100644
index f2bbe02d64..b8eb28944a 100644
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -45,7 +45,7 @@ ___lxstat64 (int vers, const char *name, struct stat64 *buf)
Expand Down Expand Up @@ -160427,7 +160427,7 @@ index 55abd2394d..25964fd256 100644

/* Clone must not fail. */
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index aa631521d0..6c042537f0 100644
index e7dd6a571c..2bbc620bea 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -45,7 +45,7 @@ ___xstat64 (int vers, const char *name, struct stat64 *buf)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From afd78321ae20469fc4681d624a66c0bf15626ce9 Mon Sep 17 00:00:00 2001
From b40205bd38c0e07dfae338728f19f655fbadcc94 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Thu, 23 May 2024 16:35:52 +0200
Subject: [PATCH 2/9] Replay "Refer to C23 in place of C2X in glibc" also for
Subject: [PATCH 02/12] Replay "Refer to C23 in place of C2X in glibc" also for
ia64

See 42cc619dfbc44e263239c2de870bae11ad65810a for reference.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 88a62bf6e308a437d090472db5a83a5c3385ca17 Mon Sep 17 00:00:00 2001
From 448d4f9608f1613243aa817f600436f00bc21bb6 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 23 Jun 2024 21:31:55 +0200
Subject: [PATCH 3/9] Replay "Implement C23 log2p1" also for ia64
Subject: [PATCH 03/12] Replay "Implement C23 log2p1" also for ia64

See 79c52daf4740b00bef43e4f5a4281b3480459b38 for reference.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 3a82df49438dd3bac43ac5ef1760a91d923cf023 Mon Sep 17 00:00:00 2001
From 724d658377e19bab96722c8763ef47a6800fe051 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Thu, 27 Jun 2024 10:22:11 +0200
Subject: [PATCH 4/9] Replay "Implement C23 logp1" also for ia64
Subject: [PATCH 04/12] Replay "Implement C23 logp1" also for ia64

See bb014f50c4a0c8d8db1ba5af55c104e430b5533d for reference.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f643c664ad5cb14d2622665fcb8e69f92fc08f1e Mon Sep 17 00:00:00 2001
From f2eb2bad0086cfedee01f37559eb44fdac0f0fec Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 23 Jun 2024 21:34:06 +0200
Subject: [PATCH 5/9] Replay "Implement C23 log10p1" also for ia64
Subject: [PATCH 05/12] Replay "Implement C23 log10p1" also for ia64

See 55eb99e9a9d840ba452b128be14d6529c2dde039 for reference.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bef9a76598f1d5dda2040de3907bc550240cc99e Mon Sep 17 00:00:00 2001
From 9660d1922e2df51533ddd58ac97f31cb59e68e20 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 23 Jun 2024 21:36:17 +0200
Subject: [PATCH 6/9] Replay "Implement C23 exp2m1, exp10m1" also for ia64
Subject: [PATCH 06/12] Replay "Implement C23 exp2m1, exp10m1" also for ia64

See 7ec903e028271d029818378fd60ddaf6b76b89ac for reference.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 81f61bd0e7eaac8f5b17986233fb7b29c8c96733 Mon Sep 17 00:00:00 2001
From c33d1f4728d474addba1e082bb1b7d4a27aab59c Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Tue, 9 Jul 2024 22:42:12 +0200
Subject: [PATCH 7/9] Fix ia64 build after
Subject: [PATCH 07/12] Fix ia64 build after
7ec903e028271d029818378fd60ddaf6b76b89ac

Fixes #2.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f469f5ade09f3f8e00b7adf8e27221e9aa94bf94 Mon Sep 17 00:00:00 2001
From 2bb479a7521ba1f663f330d41150d8256d925906 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Mon, 2 Sep 2024 22:50:09 +0200
Subject: [PATCH 8/9] Revert "elf: Make dl-fptr and dl-symaddr hppa specific"
Subject: [PATCH 08/12] Revert "elf: Make dl-fptr and dl-symaddr hppa specific"

This reverts commit 745c3cc10f2d5173a25e3bd4d022d304f4ac9a47.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f2d4c23fc7bbf6f3b530f2139bc8ae70f8fac328 Mon Sep 17 00:00:00 2001
From f7b02d54fca9a55ae6d13530c60a2720b6544b92 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
Subject: [PATCH 09/12] ia64: Qualify 'u' and 'bits' with '__' prefix

---
sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h | 4 ++--
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 67cc080c0e5b33dc1b3d556d769074fb15588416 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Thu, 5 Dec 2024 21:32:16 +0100
Subject: [PATCH 10/12] Replay "Implement C23 cospi" also for ia64

See 0ae0af68d8fa3bf6cbe1e4f1de5929ff71de67b3 for reference.
---
sysdeps/unix/sysv/linux/ia64/libm.abilist | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/sysdeps/unix/sysv/linux/ia64/libm.abilist b/sysdeps/unix/sysv/linux/ia64/libm.abilist
index 30779aa3dd..cf84a395e9 100644
--- a/sysdeps/unix/sysv/linux/ia64/libm.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libm.abilist
@@ -1156,3 +1156,11 @@ GLIBC_2.40 logp1f32x F
GLIBC_2.40 logp1f64 F
GLIBC_2.40 logp1f64x F
GLIBC_2.40 logp1l F
+GLIBC_2.41 cospi F
+GLIBC_2.41 cospif F
+GLIBC_2.41 cospif128 F
+GLIBC_2.41 cospif32 F
+GLIBC_2.41 cospif32x F
+GLIBC_2.41 cospif64 F
+GLIBC_2.41 cospif64x F
+GLIBC_2.41 cospil F
--
2.25.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 13c66752e5bc5c0d7a183977d93ff14897f6deea Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Thu, 5 Dec 2024 21:34:16 +0100
Subject: [PATCH 11/12] Replay "Implement C23 sinpi" also for ia64

See 776938e8b8dcf2b59998979e91cc0f9db7d771a8 for reference.
---
sysdeps/unix/sysv/linux/ia64/libm.abilist | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/sysdeps/unix/sysv/linux/ia64/libm.abilist b/sysdeps/unix/sysv/linux/ia64/libm.abilist
index cf84a395e9..f80b9d6bb6 100644
--- a/sysdeps/unix/sysv/linux/ia64/libm.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libm.abilist
@@ -1164,3 +1164,11 @@ GLIBC_2.41 cospif32x F
GLIBC_2.41 cospif64 F
GLIBC_2.41 cospif64x F
GLIBC_2.41 cospil F
+GLIBC_2.41 sinpi F
+GLIBC_2.41 sinpif F
+GLIBC_2.41 sinpif128 F
+GLIBC_2.41 sinpif32 F
+GLIBC_2.41 sinpif32x F
+GLIBC_2.41 sinpif64 F
+GLIBC_2.41 sinpif64x F
+GLIBC_2.41 sinpil F
--
2.25.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 09fbbd63272876a1fd205b6143ecf235d7c726ed Mon Sep 17 00:00:00 2001
From 4f18195ee6539cbaee548b263a20cb6dea06f283 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Tue, 17 Oct 2023 20:27:53 +0200
Subject: [PATCH 2/2] Partial math FPU error fix for ia64
Subject: [PATCH 12/12] Partial math FPU error fix for ia64

--- T2-COPYRIGHT-NOTE-BEGIN ---
T2 SDE: package/*/glibc/math-fpu-error-partial-fix.patch.ia64
Expand Down

0 comments on commit cfb5d7d

Please sign in to comment.