diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-25 10:42:54 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-25 12:21:12 +0200 |
| commit | 1a5a653be2f95d4d9485d08672dc5083c74c39d8 (patch) | |
| tree | 690213469932b9a7b1ad7d99a93924761ab0d601 /rt | |
| parent | 5b3a2abfb339738085dcd8d956b570b56d03b9ed (diff) | |
| download | glibc-1a5a653be2f95d4d9485d08672dc5083c74c39d8.tar glibc-1a5a653be2f95d4d9485d08672dc5083c74c39d8.tar.gz glibc-1a5a653be2f95d4d9485d08672dc5083c74c39d8.tar.bz2 glibc-1a5a653be2f95d4d9485d08672dc5083c74c39d8.zip | |
Linux: Move mq_unlink from librt to libc
The symbol was moved using scripts/move-symbol-to-libc.py.
A placeholder symbol is needed on some architectures for the
GLIBC_2.3.4 version.
Reviewed-by: Adhemerva Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/Makefile | 2 | ||||
| -rw-r--r-- | rt/Versions | 8 | ||||
| -rw-r--r-- | rt/librt-compat.c | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/rt/Makefile b/rt/Makefile index eaf4a5a344..ca3f9e162e 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,7 +30,6 @@ routines = \ librt-routines = \ librt-compat \ - mq_unlink \ timer_create \ timer_delete \ timer_getoverr \ @@ -63,6 +62,7 @@ $(librt-routines-var) += \ mq_setattr \ mq_timedreceive \ mq_timedsend \ + mq_unlink \ tests := tst-shm tst-timer tst-timer2 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ diff --git a/rt/Versions b/rt/Versions index 3363ccb526..9a09062a2a 100644 --- a/rt/Versions +++ b/rt/Versions @@ -35,6 +35,7 @@ libc { mq_setattr; mq_timedreceive; mq_timedsend; + mq_unlink; %endif } GLIBC_2.4 { @@ -77,6 +78,7 @@ libc { mq_setattr; mq_timedreceive; mq_timedsend; + mq_unlink; %endif shm_open; shm_unlink; @@ -127,7 +129,9 @@ librt { timer_settime; } GLIBC_2.3.4 { -%if !PTHREAD_IN_LIBC +%if PTHREAD_IN_LIBC + __librt_version_placeholder; +%else mq_close; mq_getattr; mq_notify; @@ -137,8 +141,8 @@ librt { mq_setattr; mq_timedreceive; mq_timedsend; -%endif mq_unlink; +%endif } GLIBC_2.4 { %if PTHREAD_IN_LIBC diff --git a/rt/librt-compat.c b/rt/librt-compat.c index ef353acdd1..24c2ed9db4 100644 --- a/rt/librt-compat.c +++ b/rt/librt-compat.c @@ -33,6 +33,12 @@ compat_symbol (librt, __librt_version_placeholder_1, # endif # if SHLIB_COMPAT (librt, GLIBC_2_4, GLIBC_2_34) \ + && ABI_librt_GLIBC_2_3_4 != ABI_librt_GLIBC_2_1 +compat_symbol (librt, __librt_version_placeholder_1, + __librt_version_placeholder, GLIBC_2_3_4); +# endif + +# if SHLIB_COMPAT (librt, GLIBC_2_4, GLIBC_2_34) \ && ABI_librt_GLIBC_2_4 != ABI_librt_GLIBC_2_1 compat_symbol (librt, __librt_version_placeholder_1, __librt_version_placeholder, GLIBC_2_4); |