File: libc_waitpid.diff

package info (click to toggle)
dietlibc 0.34~cvs20160606-19
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 11,768 kB
  • sloc: ansic: 71,692; asm: 13,008; cpp: 1,860; makefile: 817; sh: 300; perl: 62
file content (53 lines) | stat: -rw-r--r-- 1,887 bytes parent folder | download | duplicates (2)
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
Description: Fix waitpid with -lpthread on s390{,x}, mips64, ia64
 On these four architectures waitpid() was defined as a strong function
 in libc directly, instead of having a weak alias to __libc_waitpid.
 Due to the unavailability of __libc_waitpid for this reason, linking
 against -lpthread was not possible in many cases. Follow the scheme
 for waitpid that is used on other architectures to make linking
 against -lpthread work again.
Author: Christian Seiler <christian@iwakd.de>
Bug-Debian: https://bugs.debian.org/844781
Last-Update: 2017-01-05

--- a/ia64/__waitpid.c
+++ b/ia64/__waitpid.c
@@ -1,6 +1,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-pid_t waitpid(pid_t pid, int * wait_stat, int flags) {
+pid_t __libc_waitpid(pid_t pid, int * wait_stat, int flags);
+pid_t __libc_waitpid(pid_t pid, int * wait_stat, int flags) {
   return wait4(pid, wait_stat, flags, 0);
 }
+
+pid_t waitpid(pid_t pid, int * wait_stat, int flags)
+__attribute__((weak,alias("__libc_waitpid")));
--- a/s390/__waitpid.c
+++ b/s390/__waitpid.c
@@ -1,6 +1,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-pid_t waitpid(pid_t pid, int * wait_stat, int flags) {
+pid_t __libc_waitpid(pid_t pid, int * wait_stat, int flags);
+pid_t __libc_waitpid(pid_t pid, int * wait_stat, int flags) {
   return wait4(pid, wait_stat, flags, 0);
 }
+
+pid_t waitpid(pid_t pid, int * wait_stat, int flags)
+__attribute__((weak,alias("__libc_waitpid")));
--- a/s390x/__waitpid.c
+++ b/s390x/__waitpid.c
@@ -1,6 +1,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-pid_t waitpid(pid_t pid, int * wait_stat, int flags) {
+pid_t __libc_waitpid(pid_t pid, int * wait_stat, int flags);
+pid_t __libc_waitpid(pid_t pid, int * wait_stat, int flags) {
   return wait4(pid, wait_stat, flags, 0);
 }
+
+pid_t waitpid(pid_t pid, int * wait_stat, int flags)
+__attribute__((weak,alias("__libc_waitpid")));