From patchwork Wed Feb 12 13:56:29 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andreas Schwab <schwab@suse.de>
X-Patchwork-Id: 37993
Received: (qmail 110515 invoked by alias); 12 Feb 2020 13:56:35 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 110428 invoked by uid 89); 12 Feb 2020 13:56:35 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL, BAYES_00,
	GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,
	SPF_PASS autolearn=ham version=3.3.1 spammy=
X-HELO: mx2.suse.de
From: Andreas Schwab <schwab@suse.de>
To: Lukasz Majewski <lukma@denx.de>
Cc: Joseph Myers <joseph@codesourcery.com>, Paul Eggert <eggert@cs.ucla.edu>,
	Adhemerval Zanella <adhemerval.zanella@linaro.org>,
	Alistair Francis <alistair23@gmail.com>,
	Alistair Francis <alistair.francis@wdc.com>,
	GNU C Library <libc-alpha@sourceware.org>,
	Siddhesh Poyarekar <siddhesh@gotplt.org>,
	Florian Weimer <fweimer@redhat.com>, Florian Weimer <fw@deneb.enyo.de>,
	Zack Weinberg <zackw@panix.com>, Carlos O'Donell <carlos@redhat.com>
Subject: Re: [PATCH 1/2] y2038: linux: Provide __mq_timedsend_time64
	implementation
References: <20200211165256.21848-1-lukma@denx.de> <mvmmu9pcade.fsf@suse.de>
	<20200212101835.2f33c2eb@jawa> <mvma75ocdkq.fsf@suse.de>
	<20200212113736.509a7537@jawa> <mvm5zgcccfv.fsf@suse.de>
	<20200212123109.3623f3d2@jawa> <mvm1rr0c9j8.fsf@suse.de>
	<20200212141937.1a291d02@jawa>
X-Yow: Can you MAIL a BEAN CAKE?
Date: Wed, 12 Feb 2020 14:56:29 +0100
In-Reply-To: <20200212141937.1a291d02@jawa> (Lukasz Majewski's message of
	"Wed, 12 Feb 2020 14:19:37 +0100")
Message-ID: <mvmwo8rc3jm.fsf@suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0

On Feb 12 2020, Lukasz Majewski wrote:

> I've added the struct __timespec64 definition to
> ./include/bits/struct/timespec.h
>
>
> and I had build errors on ./include/time.h which uses struct
> __timespec64 massively.
> It requires explicit adding of #include
> <include/bits/struct/timespec.h> or <bits/struct/timespec.h>

This works for me:


Andreas.

diff --git a/include/bits/types/struct_timespec.h b/include/bits/types/struct_timespec.h
index c27417cfd5..de1cf44311 100644
--- a/include/bits/types/struct_timespec.h
+++ b/include/bits/types/struct_timespec.h
@@ -1 +1,30 @@
+#ifndef _STRUCT_TIMESPEC
 #include <time/bits/types/struct_timespec.h>
+
+#ifndef _ISOMAC
+# include <endian.h>
+# if __TIMESIZE == 64
+#  define __timespec64 timespec
+# else
+/* The glibc Y2038-proof struct __timespec64 structure for a time value.
+   To keep things Posix-ish, we keep the nanoseconds field a 32-bit
+   signed long, but since the Linux field is a 64-bit signed int, we
+   pad our tv_nsec with a 32-bit unnamed bit-field padding.
+
+   As a general rule the Linux kernel is ignoring upper 32 bits of
+   tv_nsec field.  */
+struct __timespec64
+{
+  __time64_t tv_sec;         /* Seconds */
+#  if BYTE_ORDER == BIG_ENDIAN
+  __int32_t :32;             /* Padding */
+  __int32_t tv_nsec;         /* Nanoseconds */
+#  else
+  __int32_t tv_nsec;         /* Nanoseconds */
+  __int32_t :32;             /* Padding */
+#  endif
+};
+# endif
+#endif
+
+#endif
diff --git a/include/time.h b/include/time.h
index 73f66277ac..f806bd8f0f 100644
--- a/include/time.h
+++ b/include/time.h
@@ -6,7 +6,6 @@
 # include <bits/types/locale_t.h>
 # include <stdbool.h>
 # include <time/mktime-internal.h>
-# include <endian.h>
 # include <time-clockid.h>
 # include <sys/time.h>
 
@@ -60,29 +59,6 @@ extern void __tzset_parse_tz (const char *tz) attribute_hidden;
 extern void __tz_compute (__time64_t timer, struct tm *tm, int use_localtime)
   __THROW attribute_hidden;
 
-#if __TIMESIZE == 64
-# define __timespec64 timespec
-#else
-/* The glibc Y2038-proof struct __timespec64 structure for a time value.
-   To keep things Posix-ish, we keep the nanoseconds field a 32-bit
-   signed long, but since the Linux field is a 64-bit signed int, we
-   pad our tv_nsec with a 32-bit unnamed bit-field padding.
-
-   As a general rule the Linux kernel is ignoring upper 32 bits of
-   tv_nsec field.  */
-struct __timespec64
-{
-  __time64_t tv_sec;         /* Seconds */
-# if BYTE_ORDER == BIG_ENDIAN
-  __int32_t :32;             /* Padding */
-  __int32_t tv_nsec;         /* Nanoseconds */
-# else
-  __int32_t tv_nsec;         /* Nanoseconds */
-  __int32_t :32;             /* Padding */
-# endif
-};
-#endif
-
 #if __TIMESIZE == 64
 # define __itimerspec64 itimerspec
 #else