From: Carlos O'Donell <carlos@redhat.com>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 1/6] Linux: Define TIMER_T_WAS_INT_COMPAT in kernel-posix-timers.h
Date: Sun, 27 Jun 2021 17:38:14 -0400 [thread overview]
Message-ID: <8b687879-d956-cf2e-6ade-159bcec26a81@redhat.com> (raw)
In-Reply-To: <763ced0d05e0f0087d0dce3f509246778250ec94.1624620992.git.fweimer@redhat.com>
On 6/25/21 7:41 AM, Florian Weimer via Libc-alpha wrote:
> This is almost equivalent to __WORDSIZE == 64
> && OTHER_SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3_3), except
> that this expression is true for mips64/n64 targets as well,
> even though those did not undergo the timer_t transition.
Thanks. It's a shame that the untransitioned targets make this conditional
more work to create than just simply using SHLIB_COMPAT. I don't san any
easier way forward than what you've done here. At least it's clean.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> ---
> .../sysv/linux/alpha/timer_t_was_int_compat.h | 19 ++++++++++++++++++
> .../sysv/linux/ia64/timer_t_was_int_compat.h | 19 ++++++++++++++++++
> sysdeps/unix/sysv/linux/kernel-posix-timers.h | 4 ++++
> .../powerpc64/timer_t_was_int_compat.h | 19 ++++++++++++++++++
> .../s390/s390-64/timer_t_was_int_compat.h | 19 ++++++++++++++++++
> .../sparc/sparc64/timer_t_was_int_compat.h | 19 ++++++++++++++++++
> .../unix/sysv/linux/timer_t_was_int_compat.h | 20 +++++++++++++++++++
> .../linux/x86_64/64/timer_t_was_int_compat.h | 19 ++++++++++++++++++
> 8 files changed, 138 insertions(+)
> create mode 100644 sysdeps/unix/sysv/linux/alpha/timer_t_was_int_compat.h
> create mode 100644 sysdeps/unix/sysv/linux/ia64/timer_t_was_int_compat.h
> create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_t_was_int_compat.h
> create mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_t_was_int_compat.h
> create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_t_was_int_compat.h
> create mode 100644 sysdeps/unix/sysv/linux/timer_t_was_int_compat.h
> create mode 100644 sysdeps/unix/sysv/linux/x86_64/64/timer_t_was_int_compat.h
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/alpha/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..92840d92aa
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/alpha/timer_t_was_int_compat.h
> @@ -0,0 +1,19 @@
> +/* timer_t/int compatibility transition. alpha version.
> + Copyright (C) 2021 Free Software Foundation, Inc.
OK.
> + 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#define TIMER_T_WAS_INT_COMPAT 1
OK.
> diff --git a/sysdeps/unix/sysv/linux/ia64/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/ia64/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..eb7e08c7cc
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/ia64/timer_t_was_int_compat.h
> @@ -0,0 +1,19 @@
> +/* timer_t/int compatibility transition. ia64 version.
> + Copyright (C) 2021 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#define TIMER_T_WAS_INT_COMPAT 1
OK.
> diff --git a/sysdeps/unix/sysv/linux/kernel-posix-timers.h b/sysdeps/unix/sysv/linux/kernel-posix-timers.h
> index 17fc32d48f..86aa8a2ded 100644
> --- a/sysdeps/unix/sysv/linux/kernel-posix-timers.h
> +++ b/sysdeps/unix/sysv/linux/kernel-posix-timers.h
> @@ -103,3 +103,7 @@ timerid_to_kernel_timer (timer_t timerid)
> else
> return (kernel_timer_t) ((uintptr_t) timerid);
> }
> +
> +/* New targets use int instead of timer_t. The difference only
> + matters on 64-bit targets. */
> +#include <timer_t_was_int_compat.h>
OK.
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..dbb52c13d9
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_t_was_int_compat.h
> @@ -0,0 +1,19 @@
> +/* timer_t/int compatibility transition. powerpc64 version.
> + Copyright (C) 2021 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#define TIMER_T_WAS_INT_COMPAT 1
OK.
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/s390/s390-64/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..4ec28a2f9d
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/timer_t_was_int_compat.h
> @@ -0,0 +1,19 @@
> +/* timer_t/int compatibility transition. s390x version.
> + Copyright (C) 2021 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#define TIMER_T_WAS_INT_COMPAT 1
OK.
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..f4bacb63bb
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_t_was_int_compat.h
> @@ -0,0 +1,19 @@
> +/* timer_t/int compatibility transition. sparc64 version.
> + Copyright (C) 2021 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#define TIMER_T_WAS_INT_COMPAT 1
OK.
> diff --git a/sysdeps/unix/sysv/linux/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..b1c7dd7354
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/timer_t_was_int_compat.h
> @@ -0,0 +1,20 @@
> +/* timer_t/int compatibility transition. Generic version.
> + Copyright (C) 2021 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +/* timer_t did not change size (from int to a pointer type). */
> +#define TIMER_T_WAS_INT_COMPAT 0
OK. Default.
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/timer_t_was_int_compat.h b/sysdeps/unix/sysv/linux/x86_64/64/timer_t_was_int_compat.h
> new file mode 100644
> index 0000000000..9071028624
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/timer_t_was_int_compat.h
> @@ -0,0 +1,19 @@
> +/* timer_t/int compatibility transition. x86_64 version.
> + Copyright (C) 2021 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; see the file COPYING.LIB. If
> + not, see <https://www.gnu.org/licenses/>. */
> +
> +#define TIMER_T_WAS_INT_COMPAT 1
>
OK.
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-06-27 21:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 11:41 [PATCH v3 0/6] Remaining librt to libc moves Florian Weimer
2021-06-25 11:41 ` [PATCH 1/6] Linux: Define TIMER_T_WAS_INT_COMPAT in kernel-posix-timers.h Florian Weimer
2021-06-27 21:38 ` Carlos O'Donell [this message]
2021-06-25 11:41 ` [PATCH 2/6] Linux: Move timer_create, timer_delete from librt to libc Florian Weimer
2021-06-25 11:42 ` [PATCH 3/6] Linux: Move timer_getoverrun " Florian Weimer
2021-06-25 11:42 ` [PATCH 4/6] Linux: Move timer_gettime, __timer_gettime64 " Florian Weimer
2021-06-25 11:42 ` [PATCH 5/6] Linux: Move timer_settime, __timer_settime64 " Florian Weimer
2021-06-25 11:42 ` [PATCH 6/6] Linux: Cleanups after librt move Florian Weimer
2021-06-27 21:39 ` Carlos O'Donell
2021-06-27 21:39 ` [PATCH v3 0/6] Remaining librt to libc moves Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b687879-d956-cf2e-6ade-159bcec26a81@redhat.com \
--to=carlos@redhat.com \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).