This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[review] nptl: Add more missing placeholder abi symbol from nanosleep move
- From: "Carlos O'Donell (Code Review)" <gerrit at gnutoolchain-gerrit dot osci dot io>
- To: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>, libc-alpha at sourceware dot org
- Date: Wed, 27 Nov 2019 14:00:36 -0500
- Subject: [review] nptl: Add more missing placeholder abi symbol from nanosleep move
- Auto-submitted: auto-generated
- References: <gerrit.1573149193000.I347a4dbdc931bb42b359456932dd1e17aa4d4078@gnutoolchain-gerrit.osci.io>
- Reply-to: gnutoolchain-gerrit at osci dot io
Carlos O'Donell has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/524
......................................................................
Patch Set 1: Code-Review+1
(5 comments)
Solution looks good for the missing symbol sets.
Fix commit message typos, and push again and I'll review.
| --- /dev/null
| +++ /COMMIT_MSG
| @@ -1,0 +1,16 @@
| +Parent: 4f4bb489 (nptl: Add missing placeholder abi symbol from nanosleep move)
| +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| +AuthorDate: 2019-11-07 17:47:07 +0000
| +Commit: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| +CommitDate: 2019-11-07 14:52:43 -0300
| +
| +nptl: Add more missing placeholder abi symbol from nanosleep move
| +
| +This patch adds the __libpthread_version_placeholder for GLIBC.2.2
| +and GLIBC_2.2.6 resulting the nanosleep implementation move to libc.
PS1, Line 10:
s/resulting the/resulting from the/g
| +This aims to fix the wrong compat symbol definition 79a547b162657b3.
| +
| +Checked with a updated-abi on the all afftected abis of nanosleep
PS1, Line 13:
s/afftected/affected/g
| +move.
| +
| +Change-Id: I347a4dbdc931bb42b359456932dd1e17aa4d4078
| --- nptl/libpthread-compat.c
| +++ nptl/libpthread-compat.c
| @@ -21,17 +21,31 @@ #include <shlib-compat.h>
| /* This is an unused compatibility symbol definition, to prevent ld
| from creating a weak version definition for GLIBC_2.1.2. (__vfork
| used to be defined at that version, but it is now provided by libc,
| and there are no versions left in libpthread for that symbol
| version.) If the ABI baseline for glibc is the GLIBC_2.2 symbol
| version or later, the placeholder symbol is not needed because
| there are plenty of other symbols which populate those later
| versions. */
| -#if (SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2_6))
| +#if (SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2) \
| + || SHLIB_COMPAT (libpthread, GLIBC_2_2_6, GLIBC_2_3))
PS1, Line 30:
OK, Compat for two ranges.
| void
| attribute_compat_text_section
| __libpthread_version_placeholder (void)
| {
| }
| compat_symbol (libpthread, __libpthread_version_placeholder,
| __libpthread_version_placeholder, GLIBC_2_1_2);
| #endif
| +
| +#if (SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2))
| +strong_alias (__libpthread_version_placeholder,
| + __libpthread_version_placeholder_212)
| +compat_symbol (libpthread, __libpthread_version_placeholder_212,
| + __libpthread_version_placeholder, GLIBC_2_1_2);
| +#endif
| +#if (SHLIB_COMPAT (libpthread, GLIBC_2_2_6, GLIBC_2_3))
| +strong_alias (__libpthread_version_placeholder,
| + __libpthread_version_placeholder_226)
| +compat_symbol (libpthread, __libpthread_version_placeholder_226,
| + __libpthread_version_placeholder, GLIBC_2_2_6);
| +#endif
PS1, Line 51:
OK. define the strong and compat alises for the two version ranges.
| --- sysdeps/unix/sysv/linux/alpha/libpthread.abilist
| +++ sysdeps/unix/sysv/linux/alpha/libpthread.abilist
| @@ -186,18 +186,19 @@ GLIBC_2.2 pthread_spin_destroy F
| GLIBC_2.2 pthread_spin_init F
| GLIBC_2.2 pthread_spin_lock F
| GLIBC_2.2 pthread_spin_trylock F
| GLIBC_2.2 pthread_spin_unlock F
| GLIBC_2.2 pthread_yield F
| GLIBC_2.2 pwrite F
| GLIBC_2.2 pwrite64 F
| GLIBC_2.2 sem_timedwait F
| GLIBC_2.2.3 pthread_getattr_np F
| +GLIBC_2.2.6 __libpthread_version_placeholder F
PS1, Line 195:
OK, Add GLIBC_2.2.6 versions
| GLIBC_2.28 call_once F
| GLIBC_2.28 cnd_broadcast F
| GLIBC_2.28 cnd_destroy F
| GLIBC_2.28 cnd_init F
| GLIBC_2.28 cnd_signal F
| GLIBC_2.28 cnd_timedwait F
| GLIBC_2.28 cnd_wait F
| GLIBC_2.28 mtx_destroy F
| GLIBC_2.28 mtx_init F
--
Gerrit-Project: glibc
Gerrit-Branch: master
Gerrit-Change-Id: I347a4dbdc931bb42b359456932dd1e17aa4d4078
Gerrit-Change-Number: 524
Gerrit-PatchSet: 1
Gerrit-Owner: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Gerrit-Reviewer: Carlos O'Donell <carlos@redhat.com>
Gerrit-Comment-Date: Wed, 27 Nov 2019 19:00:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment