AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

hurd: Fix missing pthread_ compat symbol in libc

Browse Source 
5476f8cd2e ("htl: move pthread_self info libc.") and
9dfa256216 ("htl: move pthread_equal into libc") to
1dc0bc8f07 ("htl: move pthread_attr_setdetachstate into libc")
moved some pthread_ symbols from libpthread.so to libc.so, but missed
adding the compat version like 5476f8cd2e ("htl: move pthread_self
info libc.") did: libc already had these symbols as forwards,
but versioned GLIBC_2.21, while the symbols in libpthread.so were
versioned GLIBC_2.12.

To fix running executables built before this, we thus have to add the
GLIBC_2.12 version, otherwise execution fails with e.g.

/usr/lib/i386-gnu/libglib-2.0.so: symbol lookup error: /usr/lib/i386-gnu/libglib-2.0.so: undefined symbol: pthread_attr_setinheritsched, version GLIBC_2.12
This commit is contained in:
Samuel Thibault 2024-07-17 02:03:13 +02:00
parent ec119972cb
commit 8dc3f4f8ad
12 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htl/Versions
View File

@ -3,6 +3,16 @@ libc {
GLIBC_2.12 {
pthread_self;
__pthread_self;
pthread_attr_getdetachstate;
pthread_attr_getinheritsched;
pthread_attr_getschedparam;
pthread_attr_getschedpolicy;
pthread_attr_setdetachstate;
pthread_attr_setinheritsched;
pthread_attr_setschedpolicy;
pthread_equal;
pthread_getschedparam;
pthread_setschedparam;
}
GLIBC_2.21 {

7
sysdeps/htl/pt-attr-getdetachstate.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -26,4 +27,8 @@ __pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
return 0;
}
weak_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate);
versioned_symbol (libc, __pthread_attr_getdetachstate, pthread_attr_getdetachstate, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_getdetachstate, pthread_attr_getdetachstate, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-attr-getinheritsched.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -26,4 +27,8 @@ __pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inheritsched)
return 0;
}
weak_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched);
versioned_symbol (libc, __pthread_attr_getinheritsched, pthread_attr_getinheritsched, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_getinheritsched, pthread_attr_getinheritsched, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-attr-getschedparam.c
View File

@ -19,6 +19,7 @@
#include <pthread.h>
#include <sched.h>
#include <string.h>
#include <shlib-compat.h>
#include <pt-internal.h>
@ -30,4 +31,8 @@ __pthread_attr_getschedparam (const pthread_attr_t *attr,
return 0;
}
weak_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam);
versioned_symbol (libc, __pthread_attr_getschedparam, pthread_attr_getschedparam, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_getschedparam, pthread_attr_getschedparam, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-attr-getschedpolicy.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -26,4 +27,8 @@ __pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
return 0;
}
weak_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
versioned_symbol (libc, __pthread_attr_getschedpolicy, pthread_attr_getschedpolicy, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_getschedpolicy, pthread_attr_getschedpolicy, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-attr-setdetachstate.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -35,4 +36,8 @@ __pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
return 0;
}
weak_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate);
versioned_symbol (libc, __pthread_attr_setdetachstate, pthread_attr_setdetachstate, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_setdetachstate, pthread_attr_setdetachstate, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-attr-setinheritsched.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -35,4 +36,8 @@ __pthread_attr_setinheritsched (pthread_attr_t *attr, int inheritsched)
return 0;
}
weak_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched);
versioned_symbol (libc, __pthread_attr_setinheritsched, pthread_attr_setinheritsched, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_setinheritsched, pthread_attr_setinheritsched, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-attr-setschedpolicy.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -39,4 +40,8 @@ __pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
return 0;
}
weak_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
versioned_symbol (libc, __pthread_attr_setschedpolicy, pthread_attr_setschedpolicy, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_attr_setschedpolicy, pthread_attr_setschedpolicy, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-equal.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
/* Return true if __T1 and __T2 both name the same thread. Otherwise,
@ -27,4 +28,8 @@ __pthread_equal (pthread_t __t1, pthread_t __t2)
return __t1 == __t2;
}
weak_alias (__pthread_equal, pthread_equal);
versioned_symbol (libc, __pthread_equal, pthread_equal, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_equal, pthread_equal, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-getschedparam.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -28,4 +29,8 @@ __pthread_getschedparam (pthread_t thread, int *policy,
return 0;
}
weak_alias (__pthread_getschedparam, pthread_getschedparam);
versioned_symbol (libc, __pthread_getschedparam, pthread_getschedparam, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_getschedparam, pthread_getschedparam, GLIBC_2_12);
#endif

7
sysdeps/htl/pt-setschedparam.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -26,5 +27,9 @@ __pthread_setschedparam (pthread_t thread, int policy,
return ENOSYS;
}
weak_alias (__pthread_setschedparam, pthread_setschedparam);
versioned_symbol (libc, __pthread_setschedparam, pthread_setschedparam, GLIBC_2_21);
stub_warning (pthread_setschedparam)
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_setschedparam, pthread_setschedparam, GLIBC_2_12);
#endif

10
sysdeps/mach/hurd/i386/libc.abilist
View File

@ -29,7 +29,17 @@ GLIBC_2.11 mkostemps64 F
GLIBC_2.11 mkstemps F
GLIBC_2.11 mkstemps64 F
GLIBC_2.12 __pthread_self F
GLIBC_2.12 pthread_attr_getdetachstate F
GLIBC_2.12 pthread_attr_getinheritsched F
GLIBC_2.12 pthread_attr_getschedparam F
GLIBC_2.12 pthread_attr_getschedpolicy F
GLIBC_2.12 pthread_attr_setdetachstate F
GLIBC_2.12 pthread_attr_setinheritsched F
GLIBC_2.12 pthread_attr_setschedpolicy F
GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_self F
GLIBC_2.12 pthread_setschedparam F
GLIBC_2.13 __fentry__ F
GLIBC_2.14 syncfs F
GLIBC_2.15 __fdelt_chk F