diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch index 4362efae77..30c4c69877 100644 --- a/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-cherry-picked-from.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 588d936b9aa65e7cc8b1eb2cad1d209087db43a9 Mon Sep 17 00:00:00 2001 | 1 | From 723a31d3e2627211b39fbcc08f75b3c23c4096c5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 31 Dec 2015 15:10:33 -0800 | 3 | Date: Thu, 31 Dec 2015 15:10:33 -0800 |
4 | Subject: [PATCH 20/24] eglibc: cherry-picked from | 4 | Subject: [PATCH 20/25] eglibc: cherry-picked from |
5 | 5 | ||
6 | http://www.eglibc.org/archives/patches/msg00772.html | 6 | http://www.eglibc.org/archives/patches/msg00772.html |
7 | 7 | ||
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 13 insertions(+), 1 deletion(-) | 15 | 1 file changed, 13 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/resolv/res_libc.c b/resolv/res_libc.c | 17 | diff --git a/resolv/res_libc.c b/resolv/res_libc.c |
18 | index a8394e0..981ac7c 100644 | 18 | index a4b376f..3256e12 100644 |
19 | --- a/resolv/res_libc.c | 19 | --- a/resolv/res_libc.c |
20 | +++ b/resolv/res_libc.c | 20 | +++ b/resolv/res_libc.c |
21 | @@ -18,6 +18,7 @@ | 21 | @@ -21,11 +21,13 @@ |
22 | #include <atomic.h> | 22 | #include <atomic.h> |
23 | #include <limits.h> | 23 | #include <limits.h> |
24 | #include <sys/types.h> | 24 | #include <sys/types.h> |
@@ -26,15 +26,13 @@ index a8394e0..981ac7c 100644 | |||
26 | #include <netinet/in.h> | 26 | #include <netinet/in.h> |
27 | #include <arpa/nameser.h> | 27 | #include <arpa/nameser.h> |
28 | #include <resolv.h> | 28 | #include <resolv.h> |
29 | @@ -28,6 +29,7 @@ | 29 | #include <libc-lock.h> |
30 | out) since res_init() should go into libc.so but the rest of that | ||
31 | file should not. */ | ||
32 | 30 | ||
33 | +__libc_lock_define_initialized (static, lock); | 31 | +__libc_lock_define_initialized (static, lock); |
34 | extern unsigned long long int __res_initstamp attribute_hidden; | 32 | extern unsigned long long int __res_initstamp attribute_hidden; |
35 | /* We have atomic increment operations on 64-bit platforms. */ | 33 | /* We have atomic increment operations on 64-bit platforms. */ |
36 | #if __WORDSIZE == 64 | 34 | #if __WORDSIZE == 64 |
37 | @@ -35,7 +37,6 @@ extern unsigned long long int __res_initstamp attribute_hidden; | 35 | @@ -33,7 +35,6 @@ extern unsigned long long int __res_initstamp attribute_hidden; |
38 | # define atomicincunlock(lock) (void) 0 | 36 | # define atomicincunlock(lock) (void) 0 |
39 | # define atomicinc(var) catomic_increment (&(var)) | 37 | # define atomicinc(var) catomic_increment (&(var)) |
40 | #else | 38 | #else |
@@ -42,7 +40,7 @@ index a8394e0..981ac7c 100644 | |||
42 | # define atomicinclock(lock) __libc_lock_lock (lock) | 40 | # define atomicinclock(lock) __libc_lock_lock (lock) |
43 | # define atomicincunlock(lock) __libc_lock_unlock (lock) | 41 | # define atomicincunlock(lock) __libc_lock_unlock (lock) |
44 | # define atomicinc(var) ++var | 42 | # define atomicinc(var) ++var |
45 | @@ -94,7 +95,18 @@ res_init(void) { | 43 | @@ -92,7 +93,18 @@ res_init(void) { |
46 | int | 44 | int |
47 | __res_maybe_init (res_state resp, int preinit) | 45 | __res_maybe_init (res_state resp, int preinit) |
48 | { | 46 | { |
@@ -62,5 +60,5 @@ index a8394e0..981ac7c 100644 | |||
62 | if (resp->nscount > 0) | 60 | if (resp->nscount > 0) |
63 | __res_iclose (resp, true); | 61 | __res_iclose (resp, true); |
64 | -- | 62 | -- |
65 | 2.6.4 | 63 | 2.8.2 |
66 | 64 | ||