From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id CB75B3858D38 for ; Fri, 12 Apr 2024 16:15:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB75B3858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CB75B3858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::436 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712938539; cv=none; b=Q//I+SunyAVcZjNGzA+CiZlx/glzQDpOJ6wsepIoR8YFZmFX6ubqp+iWx6zKBKcdiF6P5Fg4Oe9EOKSyn9w6cdbw+jOt/5kdBsThzf2bYBRefuGGg1z8D7ju+Zl+tBkOufgpfAKmcfq86kECamR3aKzV3gwFk315TCpuEN+XpL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712938539; c=relaxed/simple; bh=hIP6Ls5z/SQfnbci5rOd9hf5vIoUJR4mgF7IDJKceZM=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=jCosImN7PcS7Mq2wQSEW/OIBN9Wzbki8blHwwBsCcbvt1ArUuV1aM8aDwuFEYa/iLEtWQMnK8ucoEyBBRH4TZbqnw/p3mOv1vlpP+pG7aEi3swouAnAe7wucZS477vUJTe0r87Qaq1ppiapDhG29F9Ld663ztbHZT/uVm69Y1wU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6edc61d0ff6so993392b3a.2 for ; Fri, 12 Apr 2024 09:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712938535; x=1713543335; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=GMQpNbAmhCPJJGB26qC8+3K+8Ua2/nOlxxw6aFp+z0U=; b=VIcg6HIx8SGU+KrTsUbS7Iw/5wOEkM9iahRsM8Ip8cVTp0znMdDEOwIq+Gry1T8hVI oXBuRk8+IuYPItI65tmxnotnFqLucYCK+VI4u1uLi0C8c7XxTcBPMpQ+VE7ZybrDiLxv ZsVWY7Pa/wEoIBM28QCEepBLL8p7NI2gXyPH7HyS0DbPXa2ddrPmv8BmTVdWwZMYqFCi /loCoSdH2uuNnzvPKbibA+bpCq/0l6Dct8uc7dtEeN2RxXIqx0ykYInSCqqmp0Kz/tPj wy0j+Ul/S3yK+OIIT4aJ0ia6Ir9C7ALgk/+Q6Gme8H/nxDxhAel1tCLoMCqJHABhco4e iGXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712938535; x=1713543335; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GMQpNbAmhCPJJGB26qC8+3K+8Ua2/nOlxxw6aFp+z0U=; b=GbGWti8a9OPtSy4nZpijWQhWXKlr+oYE7tFs2uyF1PCQiqT+cmGc4lPL/5GxDPlRZ5 sKeI1cylnsRd/LaOBZgMW2D5x/vUngm/QHtR+GestIAPH+Ydg/MpdDgXa88aSN1DIhzw ghURggLYU+c3SKyWRFHJsyhlsFyE1a9Kzdev6lkpq445M5v9Fp6snIX4y9e15wwkW2TS Wo5scocv+Yzw7qJui/K2XEC0uFcLJadFJb0wicT2DnR0mCYLmijpaXG+dI+MkMkjJQ58 1A72XyHKIHOINLJev1k6cxytbZU4SW+WuWsVoVZNV24dpYycy02hY5v5nkuMs6M0Bhlc zx1A== X-Forwarded-Encrypted: i=1; AJvYcCW8r0QBrJawWp4qkRX4MEOsm1k3kZbNrovVFvj2+e+2rhIWx6sp6VVScCfm/xAa5f0O5uqC9xAmDjTlrV6sWtUFpcGVPlHSgTE1 X-Gm-Message-State: AOJu0Yy8FSW8msv5BFj0LyfDF+7s3TiwBgalbq5gZnnbIvE7P78fh3WQ OhjYu3mpeN2R54zfS4Z4sZ52PeSKDbiOXROJ7lh9T5gT6PnlzckM/ADyUAhEsrQ= X-Google-Smtp-Source: AGHT+IFqMxeaRjUdf/Xalfrjv0NEBKDkzmzZU5saVzJ61+ynudw5zDAKJwh1iTj2QdM2EAaYekq9eQ== X-Received: by 2002:a05:6a21:3381:b0:1a7:58ca:cdf3 with SMTP id yy1-20020a056a21338100b001a758cacdf3mr4238615pzb.8.1712938534517; Fri, 12 Apr 2024 09:15:34 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c0:d8e5:c10b:67bb:5fcf:ca20? ([2804:1b3:a7c0:d8e5:c10b:67bb:5fcf:ca20]) by smtp.gmail.com with ESMTPSA id e20-20020a170902f1d400b001e3e09690c6sm3179586plc.199.2024.04.12.09.15.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Apr 2024 09:15:34 -0700 (PDT) Message-ID: <6783b777-5411-4130-b2f9-305813c986c7@linaro.org> Date: Fri, 12 Apr 2024 13:15:31 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 2/3] login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) To: Florian Weimer , libc-alpha@sourceware.org References: Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 10/04/24 03:45, Florian Weimer wrote: > These structs describe file formats under /var/log, and should not > depend on the definition of _TIME_BITS. This is achieved by > defining __WORDSIZE_TIME64_COMPAT32 to 1 on 32-bit ports that > support 32-bit time_t values (where __time_t is 32 bits). LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > bits/wordsize.h | 6 ++++-- > login/Makefile | 4 +++- > login/tst-utmp-size-64.c | 2 ++ > sysdeps/arm/bits/wordsize.h | 21 +++++++++++++++++++ > sysdeps/csky/bits/wordsize.h | 21 +++++++++++++++++++ > sysdeps/m68k/bits/wordsize.h | 21 +++++++++++++++++++ > sysdeps/microblaze/bits/wordsize.h | 21 +++++++++++++++++++ > sysdeps/mips/bits/wordsize.h | 6 +----- > sysdeps/nios2/bits/wordsize.h | 21 +++++++++++++++++++ > sysdeps/powerpc/powerpc32/bits/wordsize.h | 3 +-- > sysdeps/powerpc/powerpc64/bits/wordsize.h | 3 +-- > sysdeps/sh/bits/wordsize.h | 21 +++++++++++++++++++ > sysdeps/sparc/sparc32/bits/wordsize.h | 2 +- > sysdeps/sparc/sparc64/bits/wordsize.h | 3 +-- > sysdeps/unix/sysv/linux/hppa/bits/wordsize.h | 21 +++++++++++++++++++ > .../unix/sysv/linux/powerpc/bits/wordsize.h | 3 +-- > sysdeps/unix/sysv/linux/sparc/bits/wordsize.h | 3 +-- > sysdeps/x86/bits/wordsize.h | 5 ++--- > 18 files changed, 165 insertions(+), 22 deletions(-) > create mode 100644 login/tst-utmp-size-64.c > create mode 100644 sysdeps/arm/bits/wordsize.h > create mode 100644 sysdeps/csky/bits/wordsize.h > create mode 100644 sysdeps/m68k/bits/wordsize.h > create mode 100644 sysdeps/microblaze/bits/wordsize.h > create mode 100644 sysdeps/nios2/bits/wordsize.h > create mode 100644 sysdeps/sh/bits/wordsize.h > create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/wordsize.h > > diff --git a/bits/wordsize.h b/bits/wordsize.h > index 14edae3a11..53013a9275 100644 > --- a/bits/wordsize.h > +++ b/bits/wordsize.h > @@ -21,7 +21,9 @@ > #define __WORDSIZE32_PTRDIFF_LONG > > /* Set to 1 in order to force time types to be 32 bits instead of 64 bits in > - struct lastlog and struct utmp{,x} on 64-bit ports. This may be done in > + struct lastlog and struct utmp{,x}. This may be done in > order to make 64-bit ports compatible with 32-bit ports. Set to 0 for > - 64-bit ports where the time types are 64-bits or for any 32-bit ports. */ > + 64-bit ports where the time types are 64-bits and new 32-bit ports > + where time_t is 64 bits, and there is no companion architecture with > + 32-bit time_t. */ > #define __WORDSIZE_TIME64_COMPAT32 > diff --git a/login/Makefile b/login/Makefile > index b26ac42bfc..f91190e3dc 100644 > --- a/login/Makefile > +++ b/login/Makefile > @@ -44,7 +44,9 @@ subdir-dirs = programs > vpath %.c programs > > tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ > - tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size > + tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64 > + > +CFLAGS-tst-utmp-size-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > > # Empty compatibility library for old binaries. > extra-libs := libutil > diff --git a/login/tst-utmp-size-64.c b/login/tst-utmp-size-64.c > new file mode 100644 > index 0000000000..7a581a4c12 > --- /dev/null > +++ b/login/tst-utmp-size-64.c > @@ -0,0 +1,2 @@ > +/* The on-disk layout must not change in time64 mode. */ > +#include "tst-utmp-size.c" > diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/arm/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/csky/bits/wordsize.h b/sysdeps/csky/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/csky/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/m68k/bits/wordsize.h b/sysdeps/m68k/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/m68k/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/microblaze/bits/wordsize.h b/sysdeps/microblaze/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/microblaze/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h > index 57f0f2a22f..30dd3fd85d 100644 > --- a/sysdeps/mips/bits/wordsize.h > +++ b/sysdeps/mips/bits/wordsize.h > @@ -19,11 +19,7 @@ > > #define __WORDSIZE _MIPS_SZPTR > > -#if _MIPS_SIM == _ABI64 > -# define __WORDSIZE_TIME64_COMPAT32 1 > -#else > -# define __WORDSIZE_TIME64_COMPAT32 0 > -#endif > +#define __WORDSIZE_TIME64_COMPAT32 1 > > #if __WORDSIZE == 32 > #define __WORDSIZE32_SIZE_ULONG 0 > diff --git a/sysdeps/nios2/bits/wordsize.h b/sysdeps/nios2/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/nios2/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/powerpc/powerpc32/bits/wordsize.h b/sysdeps/powerpc/powerpc32/bits/wordsize.h > index 04ca9debf0..6993fb6b29 100644 > --- a/sysdeps/powerpc/powerpc32/bits/wordsize.h > +++ b/sysdeps/powerpc/powerpc32/bits/wordsize.h > @@ -2,10 +2,9 @@ > > #if defined __powerpc64__ > # define __WORDSIZE 64 > -# define __WORDSIZE_TIME64_COMPAT32 1 > #else > # define __WORDSIZE 32 > -# define __WORDSIZE_TIME64_COMPAT32 0 > # define __WORDSIZE32_SIZE_ULONG 0 > # define __WORDSIZE32_PTRDIFF_LONG 0 > #endif > +#define __WORDSIZE_TIME64_COMPAT32 1 > diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64/bits/wordsize.h > index 04ca9debf0..6993fb6b29 100644 > --- a/sysdeps/powerpc/powerpc64/bits/wordsize.h > +++ b/sysdeps/powerpc/powerpc64/bits/wordsize.h > @@ -2,10 +2,9 @@ > > #if defined __powerpc64__ > # define __WORDSIZE 64 > -# define __WORDSIZE_TIME64_COMPAT32 1 > #else > # define __WORDSIZE 32 > -# define __WORDSIZE_TIME64_COMPAT32 0 > # define __WORDSIZE32_SIZE_ULONG 0 > # define __WORDSIZE32_PTRDIFF_LONG 0 > #endif > +#define __WORDSIZE_TIME64_COMPAT32 1 > diff --git a/sysdeps/sh/bits/wordsize.h b/sysdeps/sh/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/sh/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/sparc/sparc32/bits/wordsize.h b/sysdeps/sparc/sparc32/bits/wordsize.h > index 4bbd2e63b4..a2e79e0fa9 100644 > --- a/sysdeps/sparc/sparc32/bits/wordsize.h > +++ b/sysdeps/sparc/sparc32/bits/wordsize.h > @@ -1,6 +1,6 @@ > /* Determine the wordsize from the preprocessor defines. */ > > #define __WORDSIZE 32 > -#define __WORDSIZE_TIME64_COMPAT32 0 > +#define __WORDSIZE_TIME64_COMPAT32 1 > #define __WORDSIZE32_SIZE_ULONG 0 > #define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/sparc/sparc64/bits/wordsize.h b/sysdeps/sparc/sparc64/bits/wordsize.h > index 2f66f10d72..ea103e5970 100644 > --- a/sysdeps/sparc/sparc64/bits/wordsize.h > +++ b/sysdeps/sparc/sparc64/bits/wordsize.h > @@ -2,10 +2,9 @@ > > #if defined __arch64__ || defined __sparcv9 > # define __WORDSIZE 64 > -# define __WORDSIZE_TIME64_COMPAT32 1 > #else > # define __WORDSIZE 32 > -# define __WORDSIZE_TIME64_COMPAT32 0 > # define __WORDSIZE32_SIZE_ULONG 0 > # define __WORDSIZE32_PTRDIFF_LONG 0 > #endif > +#define __WORDSIZE_TIME64_COMPAT32 1 > diff --git a/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h > new file mode 100644 > index 0000000000..6ecbfe7c86 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/hppa/bits/wordsize.h > @@ -0,0 +1,21 @@ > +/* Copyright (C) 1999-2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#define __WORDSIZE 32 > +#define __WORDSIZE_TIME64_COMPAT32 1 > +#define __WORDSIZE32_SIZE_ULONG 0 > +#define __WORDSIZE32_PTRDIFF_LONG 0 > diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h > index 04ca9debf0..6993fb6b29 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h > +++ b/sysdeps/unix/sysv/linux/powerpc/bits/wordsize.h > @@ -2,10 +2,9 @@ > > #if defined __powerpc64__ > # define __WORDSIZE 64 > -# define __WORDSIZE_TIME64_COMPAT32 1 > #else > # define __WORDSIZE 32 > -# define __WORDSIZE_TIME64_COMPAT32 0 > # define __WORDSIZE32_SIZE_ULONG 0 > # define __WORDSIZE32_PTRDIFF_LONG 0 > #endif > +#define __WORDSIZE_TIME64_COMPAT32 1 > diff --git a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h > index 7562875ee2..ea103e5970 100644 > --- a/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h > +++ b/sysdeps/unix/sysv/linux/sparc/bits/wordsize.h > @@ -2,10 +2,9 @@ > > #if defined __arch64__ || defined __sparcv9 > # define __WORDSIZE 64 > -# define __WORDSIZE_TIME64_COMPAT32 1 > #else > # define __WORDSIZE 32 > # define __WORDSIZE32_SIZE_ULONG 0 > # define __WORDSIZE32_PTRDIFF_LONG 0 > -# define __WORDSIZE_TIME64_COMPAT32 0 > #endif > +#define __WORDSIZE_TIME64_COMPAT32 1 > diff --git a/sysdeps/x86/bits/wordsize.h b/sysdeps/x86/bits/wordsize.h > index 70f652bca1..3f40aa76f9 100644 > --- a/sysdeps/x86/bits/wordsize.h > +++ b/sysdeps/x86/bits/wordsize.h > @@ -8,10 +8,9 @@ > #define __WORDSIZE32_PTRDIFF_LONG 0 > #endif > > +#define __WORDSIZE_TIME64_COMPAT32 1 > + > #ifdef __x86_64__ > -# define __WORDSIZE_TIME64_COMPAT32 1 > /* Both x86-64 and x32 use the 64-bit system call interface. */ > # define __SYSCALL_WORDSIZE 64 > -#else > -# define __WORDSIZE_TIME64_COMPAT32 0 > #endif