From: Collin Funk <collin.funk1@gmail.com>
Date: Mon, 1 Sep 2025 21:26:59 +0000 (-0700)
Subject: Fix the previous two commits.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5dcc6c91d3c7c6f293fe906af885831af458dac;p=thirdparty%2Fgnulib.git

Fix the previous two commits.

The issue occurs on alpha not hppa. Also add the glibc bug report link
in comments.
---

diff --git a/ChangeLog b/ChangeLog
index fba408e498..67fb38e457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,15 @@
 2025-09-01  Collin Funk  <collin.funk1@gmail.com>
 
-	sys_types-h tests: Fix a static_assert failure on glibc/hppa.
-	* tests/test-sys_types-h.c [__GLIBC__ && __hppa]: Don't check that
+	sys_types-h tests: Fix a static_assert failure on glibc/alpha.
+	* tests/test-sys_types-h.c [__GLIBC__ && __alpha]: Don't check that
 	blksize_t and blkcnt_t are signed.
 	* doc/posix-headers/sys_types.texi: Mention that these types are
 	unsigned on this platform.
 
-	sys_stat-h tests: Fix a static_assert failure on glibc/hppa.
+	sys_stat-h tests: Fix a static_assert failure on glibc/alpha.
 	Reported by Santiago Vila <sanvila@debian.org> in:
 	<https://lists.gnu.org/archive/html/bug-m4/2025-09/msg00000.html>.
-	* tests/test-sys_stat-h.c [__GLIBC__ && __hppa]: Don't check that
+	* tests/test-sys_stat-h.c [__GLIBC__ && __alpha]: Don't check that
 	blksize_t and blkcnt_t are signed.
 	* doc/posix-headers/sys_stat.texi: Mention that these types are
 	unsigned on this platform.
diff --git a/doc/posix-headers/sys_stat.texi b/doc/posix-headers/sys_stat.texi
index 1369cbb768..42040420d2 100644
--- a/doc/posix-headers/sys_stat.texi
+++ b/doc/posix-headers/sys_stat.texi
@@ -61,7 +61,8 @@ Portability problems not fixed by Gnulib:
 @itemize
 @item
 On some platforms the types @code{blksize_t} and @code{blkcnt_t} are unsigned:
-Android, glibc/HPPA.
+@c https://sourceware.org/PR33355
+Android, glibc/alpha.
 @item
 The macro @code{S_IFBLK} is missing on some platforms:
 MSVC 14.
diff --git a/doc/posix-headers/sys_types.texi b/doc/posix-headers/sys_types.texi
index 90b8a60fdb..84d9bf7dea 100644
--- a/doc/posix-headers/sys_types.texi
+++ b/doc/posix-headers/sys_types.texi
@@ -44,7 +44,8 @@ Portability problems not fixed by Gnulib:
 @itemize
 @item
 On some platforms the types @code{blksize_t} and @code{blkcnt_t} are unsigned:
-Android, glibc/HPPA.
+@c https://sourceware.org/PR33355
+Android, glibc/alpha.
 @item
 On some platforms the types @code{blksize_t} and @code{suseconds_t}
 are signed integer types that are wider than @code{long}:
diff --git a/tests/test-sys_stat-h.c b/tests/test-sys_stat-h.c
index 0979f03779..6936cc7a8b 100644
--- a/tests/test-sys_stat-h.c
+++ b/tests/test-sys_stat-h.c
@@ -341,12 +341,12 @@ static_assert (TYPE_SIGNED (off_t));
 /* POSIX requires that blksize_t is a signed integer type.  */
 #if !(defined __ANDROID__ \
       || (defined __FreeBSD_kernel__ && !defined __FreeBSD__) \
-      || defined __GLIBC__ && defined __hppa)
+      || defined __GLIBC__ && defined __alpha)
 static_assert (TYPE_SIGNED (blksize_t));
 #endif
 
 /* POSIX requires that blkcnt_t is a signed integer type.  */
-#if !(defined __ANDROID__ || defined __GLIBC__ && defined __hppa)
+#if !(defined __ANDROID__ || defined __GLIBC__ && defined __alpha)
 static_assert (TYPE_SIGNED (blkcnt_t));
 #endif
 
diff --git a/tests/test-sys_types-h.c b/tests/test-sys_types-h.c
index 9fe0f92884..b3d6abeca0 100644
--- a/tests/test-sys_types-h.c
+++ b/tests/test-sys_types-h.c
@@ -48,12 +48,12 @@ static_assert (TYPE_SIGNED (off64_t));
 /* POSIX requires that blksize_t is a signed integer type.  */
 #if !(defined __ANDROID__ \
       || (defined __FreeBSD_kernel__ && !defined __FreeBSD__) \
-      || defined __GLIBC__ && defined __hppa)
+      || defined __GLIBC__ && defined __alpha)
 static_assert (TYPE_SIGNED (blksize_t));
 #endif
 
 /* POSIX requires that blkcnt_t is a signed integer type.  */
-#if !(defined __ANDROID__ || defined __GLIBC__ && defined __hppa)
+#if !(defined __ANDROID__ || defined __GLIBC__ && defined __alpha)
 static_assert (TYPE_SIGNED (blkcnt_t));
 #endif