From patchwork Thu May 18 23:46:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 69644 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 91FD1385773E for ; Thu, 18 May 2023 23:46:19 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 438783858CDB for ; Thu, 18 May 2023 23:46:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 438783858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 404E32018A; Fri, 19 May 2023 01:46:05 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uYQu29og9xdE; Fri, 19 May 2023 01:46:05 +0200 (CEST) Received: from begin.home (apoitiers-658-1-118-253.w92-162.abo.wanadoo.fr [92.162.65.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 0C05320189; Fri, 19 May 2023 01:46:05 +0200 (CEST) Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1pznJs-00Frgo-2B; Fri, 19 May 2023 01:46:04 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] hurd: Fix expected c++ types Date: Fri, 19 May 2023 01:46:03 +0200 Message-Id: <20230518234603.3781295-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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(-) 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