1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
This dates when libpthread was moved to glibc and some features were added.
2.13-31/38/39 dates when the global signal disposition call was added.
TODO: _DEBIAN_ in versions however pose problem. Remove the _DEBIAN_ version
once packages are rebuilt against 2.21.
Index: glibc-2.24/libpthread/Versions
===================================================================
--- glibc-2.24.orig/libpthread/Versions
+++ glibc-2.24/libpthread/Versions
@@ -1,5 +1,5 @@
libc {
- GLIBC_2.13 {
+ GLIBC_2.13_DEBIAN_31 {
pthread_attr_destroy; pthread_attr_getdetachstate;
pthread_attr_getinheritsched; pthread_attr_getschedparam;
pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_init;
@@ -20,6 +20,24 @@ libc {
GLIBC_2.22 {
__register_atfork;
}
+ GLIBC_2.21 {
+ pthread_attr_destroy; pthread_attr_getdetachstate;
+ pthread_attr_getinheritsched; pthread_attr_getschedparam;
+ pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_init;
+ pthread_attr_setdetachstate; pthread_attr_setinheritsched;
+ pthread_attr_setschedparam; pthread_attr_setschedpolicy;
+ pthread_attr_setscope;
+ pthread_condattr_destroy; pthread_condattr_init;
+ pthread_cond_broadcast; pthread_cond_destroy;
+ pthread_cond_init; pthread_cond_signal; pthread_cond_wait;
+ pthread_cond_timedwait;
+ pthread_equal;
+ pthread_exit; pthread_getschedparam; pthread_setschedparam;
+ pthread_mutex_destroy; pthread_mutex_init;
+ pthread_mutex_lock; pthread_mutex_trylock; pthread_mutex_unlock;
+ pthread_self; pthread_setcancelstate; pthread_setcanceltype;
+ __pthread_get_cleanup_stack;
+ }
GLIBC_PRIVATE {
__libc_alloca_cutoff;
__libc_pthread_init;
@@ -136,7 +154,13 @@ libpthread {
__pthread_spin_lock; __pthread_spin_trylock; __pthread_spin_unlock;
_pthread_spin_lock;
}
- GLIBC_2.17 {
+ GLIBC_2.13_DEBIAN_38 {
+ pthread_hurd_cond_wait_np;
+ }
+ GLIBC_2.13_DEBIAN_39 {
+ pthread_hurd_cond_timedwait_np;
+ }
+ GLIBC_2.21 {
pthread_hurd_cond_wait_np;
pthread_hurd_cond_timedwait_np;
}
Index: glibc-2.24/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c
===================================================================
--- glibc-2.24.orig/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c
+++ glibc-2.24/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c
@@ -23,6 +23,8 @@
#include <pt-internal.h>
+#include <shlib-compat.h>
+
extern int __pthread_hurd_cond_timedwait_internal (pthread_cond_t *cond,
pthread_mutex_t *mutex,
const struct timespec *abstime);
@@ -34,8 +36,18 @@ __pthread_hurd_cond_timedwait_np (pthrea
{
return __pthread_hurd_cond_timedwait_internal (cond, mutex, abstime);
}
+versioned_symbol (libpthread, __pthread_hurd_cond_timedwait_np, pthread_hurd_cond_timedwait_np, GLIBC_2_21);
-strong_alias (__pthread_hurd_cond_timedwait_np, pthread_hurd_cond_timedwait_np);
+#if SHLIB_COMPAT (libpthread, GLIBC_2_13, GLIBC_2_21)
+int
+__pthread_hurd_cond_timedwait_np_2_13 (pthread_cond_t *cond,
+ pthread_mutex_t *mutex,
+ const struct timespec *abstime)
+{
+ return __pthread_hurd_cond_timedwait_internal (cond, mutex, abstime);
+}
+compat_symbol (libpthread, __pthread_hurd_cond_timedwait_np_2_13, pthread_hurd_cond_timedwait_np, GLIBC_2_13_DEBIAN_39);
+#endif
int
__pthread_hurd_cond_timedwait_internal (pthread_cond_t *cond,
Index: glibc-2.24/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
===================================================================
--- glibc-2.24.orig/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
+++ glibc-2.24/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
@@ -23,6 +23,8 @@
#include <pt-internal.h>
+#include <shlib-compat.h>
+
/* Implemented in pt-hurd-cond-timedwait.c. */
extern int __pthread_hurd_cond_timedwait_internal (pthread_cond_t *cond,
pthread_mutex_t *mutex,
@@ -37,5 +39,17 @@ __pthread_hurd_cond_wait_np (pthread_con
err = __pthread_hurd_cond_timedwait_internal (cond, mutex, NULL);
return (err == EINTR);
}
+versioned_symbol (libpthread, __pthread_hurd_cond_wait_np, pthread_hurd_cond_wait_np, GLIBC_2_21);
-strong_alias (__pthread_hurd_cond_wait_np, pthread_hurd_cond_wait_np);
+#if SHLIB_COMPAT (libpthread, GLIBC_2_13, GLIBC_2_21)
+int
+__pthread_hurd_cond_wait_np_2_13 (pthread_cond_t *cond,
+ pthread_mutex_t *mutex)
+{
+ error_t err;
+
+ err = __pthread_hurd_cond_timedwait_internal (cond, mutex, NULL);
+ return (err == EINTR);
+}
+compat_symbol (libpthread, __pthread_hurd_cond_wait_np_2_13, pthread_hurd_cond_wait_np, GLIBC_2_13_DEBIAN_38);
+#endif
Index: glibc-2.24/libpthread/forward.c
===================================================================
--- glibc-2.24.orig/libpthread/forward.c
+++ glibc-2.24/libpthread/forward.c
@@ -24,20 +24,42 @@
#include <pthread-functions.h>
#include <fork.h>
+#include <shlib-compat.h>
+
/* Pointers to the libc functions. */
struct pthread_functions __libc_pthread_functions attribute_hidden;
int __libc_pthread_functions_init attribute_hidden;
+# define FORWARD2_NOVERSION(name, rettype, decl, params, defaction) \
+rettype \
+__##name decl \
+{ \
+ if (!__libc_pthread_functions_init) \
+ defaction; \
+ \
+ return PTHFCT_CALL (ptr_##name, params); \
+} \
# define FORWARD2(name, rettype, decl, params, defaction) \
+ FORWARD2_NOVERSION(name, rettype, decl, params, defaction) \
+versioned_symbol (libc, __##name, name, GLIBC_2_21); \
+
+#if SHLIB_COMPAT (libc, GLIBC_2_13, GLIBC_2_21)
+# define FORWARD2_NOCOMPAT(name, rettype, decl, params, defaction) \
rettype \
-name decl \
+__##name##_2_13 decl \
{ \
if (!__libc_pthread_functions_init) \
defaction; \
\
return PTHFCT_CALL (ptr_##name, params); \
}
+# define FORWARD2_COMPAT(name, rettype, decl, params, defaction) \
+ FORWARD2_NOCOMPAT(name, rettype, decl, params, defaction) \
+compat_symbol (libc, __##name##_2_13, name, GLIBC_2_13_DEBIAN_31);
+#else
+# define FORWARD2_COMPAT(name, rettype, decl, params, defaction)
+#endif
/* Same as FORWARD2, only without return. */
# define FORWARD_NORETURN(name, rettype, decl, params, defaction) \
@@ -48,10 +70,22 @@ name decl \
defaction; \
\
PTHFCT_CALL (ptr_##name, params); \
+} \
+rettype \
+name##_2_13 decl \
+{ \
+ if (!__libc_pthread_functions_init) \
+ defaction; \
+ \
+ PTHFCT_CALL (ptr_##name, params); \
}
# define FORWARD(name, decl, params, defretval) \
- FORWARD2 (name, int, decl, params, return defretval)
+ FORWARD2 (name, int, decl, params, return defretval) \
+ FORWARD2_COMPAT (name, int, decl, params, return defretval)
+# define FORWARD_NOVERSION(name, decl, params, defretval) \
+ FORWARD2_NOVERSION (name, int, decl, params, return defretval) \
+ FORWARD2_NOCOMPAT (name, int, decl, params, return defretval)
FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0)
@@ -108,7 +142,10 @@ FORWARD (pthread_equal, (pthread_t threa
/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */
FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS))
-strong_alias (__pthread_exit, pthread_exit);
+versioned_symbol (libc, __pthread_exit, pthread_exit, GLIBC_2_21);
+#if SHLIB_COMPAT (libc, GLIBC_2_13, GLIBC_2_21)
+compat_symbol (libc, __pthread_exit_2_13, pthread_exit, GLIBC_2_13_DEBIAN_31);
+#endif
FORWARD (pthread_getschedparam,
@@ -131,16 +168,21 @@ FORWARD (pthread_mutex_unlock, (pthread_
FORWARD2 (pthread_self, pthread_t, (void), (), return 0)
+FORWARD2_COMPAT (pthread_self, pthread_t, (void), (), return 0)
-FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
+FORWARD_NOVERSION (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
0)
-strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
+versioned_symbol (libc, ____pthread_setcancelstate, pthread_setcancelstate, GLIBC_2_21);
+#if SHLIB_COMPAT (libc, GLIBC_2_13, GLIBC_2_21)
+compat_symbol (libc, ____pthread_setcancelstate_2_13, pthread_setcancelstate, GLIBC_2_13_DEBIAN_31);
+#endif
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
struct __pthread_cancelation_handler *dummy_list;
FORWARD2 (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **, (void), (), return &dummy_list);
+FORWARD2_COMPAT (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **, (void), (), return &dummy_list);
/* Fork interaction */
|
