diff options
| author | Adrian Bunk <bunk@stusta.de> | 2019-05-16 10:48:34 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-16 16:35:12 +0100 |
| commit | 11fd8dc6ffb8d403c22644f7f00b761d90e8b20d (patch) | |
| tree | 42fc0eed0e36a5d549e1d9aea6bf182032ff5d3f /meta/recipes-devtools/elfutils | |
| parent | f91866aaf13d350431f6ccac3fc941072a4ad80d (diff) | |
| download | poky-11fd8dc6ffb8d403c22644f7f00b761d90e8b20d.tar.gz | |
musl: Add TEMP_FAILURE_RETRY from glibc
Patch it into musl instead of patching all users
(currently elfutils and next ofono).
(From OE-Core rev: 0c68c621d3b8690e3a346170006f75b032511a8a)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils')
| -rw-r--r-- | meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch index a4f301d9da..10cdac646c 100644 --- a/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch +++ b/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch | |||
| @@ -64,18 +64,10 @@ index 292082b..308a762 100644 | |||
| 64 | #include <stddef.h> | 64 | #include <stddef.h> |
| 65 | #include <stdint.h> | 65 | #include <stdint.h> |
| 66 | #include <sys/param.h> | 66 | #include <sys/param.h> |
| 67 | @@ -51,6 +51,16 @@ | 67 | @@ -51,6 +51,8 @@ |
| 68 | #else | 68 | #else |
| 69 | # error "Unknown byte order" | 69 | # error "Unknown byte order" |
| 70 | #endif | 70 | #endif |
| 71 | +#ifndef TEMP_FAILURE_RETRY | ||
| 72 | +#define TEMP_FAILURE_RETRY(expression) \ | ||
| 73 | + (__extension__ \ | ||
| 74 | + ({ long int __result; \ | ||
| 75 | + do __result = (long int) (expression); \ | ||
| 76 | + while (__result == -1L && errno == EINTR); \ | ||
| 77 | + __result; })) | ||
| 78 | +#endif | ||
| 79 | + | 71 | + |
| 80 | +#define error(status, errno, ...) err(status, __VA_ARGS__) | 72 | +#define error(status, errno, ...) err(status, __VA_ARGS__) |
| 81 | 73 | ||
| @@ -141,26 +133,6 @@ index 56e6105..f4a0649 100644 | |||
| 141 | #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */ | 133 | #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */ |
| 142 | #include "../libelf/libelfP.h" | 134 | #include "../libelf/libelfP.h" |
| 143 | #include "system.h" | 135 | #include "system.h" |
| 144 | diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c | ||
| 145 | index f849128..6f0aca1 100644 | ||
| 146 | --- a/libdwfl/libdwfl_crc32_file.c | ||
| 147 | +++ b/libdwfl/libdwfl_crc32_file.c | ||
| 148 | @@ -29,6 +29,15 @@ | ||
| 149 | # include <config.h> | ||
| 150 | #endif | ||
| 151 | |||
| 152 | +#ifndef TEMP_FAILURE_RETRY | ||
| 153 | +#define TEMP_FAILURE_RETRY(expression) \ | ||
| 154 | + (__extension__ \ | ||
| 155 | + ({ long int __result; \ | ||
| 156 | + do __result = (long int) (expression); \ | ||
| 157 | + while (__result == -1L && errno == EINTR); \ | ||
| 158 | + __result; })) | ||
| 159 | +#endif | ||
| 160 | + | ||
| 161 | #define crc32_file attribute_hidden __libdwfl_crc32_file | ||
| 162 | #define crc32 __libdwfl_crc32 | ||
| 163 | #include <libdwflP.h> | ||
| 164 | diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c | 136 | diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c |
| 165 | index 360e4ee..b5aa397 100644 | 137 | index 360e4ee..b5aa397 100644 |
| 166 | --- a/libdwfl/linux-kernel-modules.c | 138 | --- a/libdwfl/linux-kernel-modules.c |
