[hurd,commited] hurd: Fix expected c++ types

Message ID 20230518234603.3781295-1-samuel.thibault@ens-lyon.org
State Committed
Commit 4bd0f1b6cec4a812ffa1860950554d213dd4398e
Headers
Series [hurd,commited] hurd: Fix expected c++ types |

Checks

Context Check Description
dj/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

Samuel Thibault May 18, 2023, 11:46 p.m. UTC
  90604f670c10 ("hurd 64bit: Add data for check-c++-types") actually added
the 32bit version. This fixes it into a 64bit version.
---
 sysdeps/mach/hurd/x86_64/c++-types.data | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)
  

Patch

diff --git a/sysdeps/mach/hurd/x86_64/c++-types.data b/sysdeps/mach/hurd/x86_64/c++-types.data
index 4cde3ca667..2169b6aed7 100644
--- a/sysdeps/mach/hurd/x86_64/c++-types.data
+++ b/sysdeps/mach/hurd/x86_64/c++-types.data
@@ -1,31 +1,31 @@ 
-blkcnt64_t:x
+blkcnt64_t:l
 blkcnt_t:l
 blksize_t:l
 caddr_t:Pc
 clockid_t:i
 clock_t:l
 daddr_t:i
-dev_t:j
+dev_t:m
 fd_mask:l
-fsblkcnt64_t:y
+fsblkcnt64_t:m
 fsblkcnt_t:m
-fsfilcnt64_t:y
+fsfilcnt64_t:m
 fsfilcnt_t:m
-fsid_t:y
+fsid_t:m
 gid_t:j
 id_t:j
-ino64_t:y
+ino64_t:m
 ino_t:m
 int16_t:s
 int32_t:i
-int64_t:x
+int64_t:l
 int8_t:a
-intptr_t:i
+intptr_t:l
 key_t:i
-loff_t:x
+loff_t:l
 mode_t:j
-nlink_t:j
-off64_t:x
+nlink_t:m
+off64_t:l
 off_t:l
 pid_t:i
 pthread_attr_t:14__pthread_attr
@@ -40,15 +40,15 @@  pthread_once_t:14__pthread_once
 pthread_rwlock_t:16__pthread_rwlock
 pthread_rwlockattr_t:20__pthread_rwlockattr
 pthread_spinlock_t:i
-pthread_t:i
-quad_t:x
-register_t:i
-rlim64_t:y
+pthread_t:l
+quad_t:l
+register_t:l
+rlim64_t:m
 rlim_t:m
 sigset_t:m
-size_t:j
+size_t:m
 socklen_t:j
-ssize_t:i
+ssize_t:l
 suseconds_t:l
 time_t:l
 u_char:h
@@ -57,11 +57,11 @@  uint:j
 u_int:j
 u_int16_t:t
 u_int32_t:j
-u_int64_t:y
+u_int64_t:m
 u_int8_t:h
 ulong:m
 u_long:m
-u_quad_t:y
+u_quad_t:m
 useconds_t:j
 ushort:t
 u_short:t