From 477910b83e5ef3b3aa78b11808433846989461c8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 28 Jun 2021 09:51:01 +0200 Subject: Linux: Move timer_settime, __timer_settime64 from librt to libc The symbols were moved using scripts/move-symbol-to-libc.py. The way the ABI intransition is implemented is changed with this commit: the implementation is now consolidated in one file with a TIMER_T_WAS_INT_COMPAT check. The shared librt is now empty, so this commit adds a placeholder symbol at the base version, GLIBC_2.2, and potentially at the GLIBC_2.3.3 version as well (the leftover from the int/timer_t ABI transition). Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/librt-compat.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/librt-compat.c (limited to 'sysdeps/unix/sysv/linux/librt-compat.c') diff --git a/sysdeps/unix/sysv/linux/librt-compat.c b/sysdeps/unix/sysv/linux/librt-compat.c new file mode 100644 index 0000000..f8b0990 --- /dev/null +++ b/sysdeps/unix/sysv/linux/librt-compat.c @@ -0,0 +1,26 @@ +/* Placeholder definitions to pull in removed symbol versions. Linux 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; if not, see + . */ + +#include +#include + +/* GLIBC_2.3.3 symbols were added for the int -> timer_t ABI transition. */ +#if TIMER_T_WAS_INT_COMPAT +compat_symbol (librt, __librt_version_placeholder_1, + __librt_version_placeholder, GLIBC_2_3_3); +#endif -- cgit v1.1