From 0c68c621d3b8690e3a346170006f75b032511a8a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 16 May 2019 10:48:34 +0300 Subject: musl: Add TEMP_FAILURE_RETRY from glibc Patch it into musl instead of patching all users (currently elfutils and next ofono). Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- ...de-alternatives-for-glibc-assumptions-hel.patch | 30 +--------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'meta/recipes-devtools/elfutils') 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 #include #include #include -@@ -51,6 +51,16 @@ +@@ -51,6 +51,8 @@ #else # error "Unknown byte order" #endif -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif + +#define error(status, errno, ...) err(status, __VA_ARGS__) @@ -141,26 +133,6 @@ index 56e6105..f4a0649 100644 #include "../libdw/libdwP.h" /* DWARF_E_* values are here. */ #include "../libelf/libelfP.h" #include "system.h" -diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c -index f849128..6f0aca1 100644 ---- a/libdwfl/libdwfl_crc32_file.c -+++ b/libdwfl/libdwfl_crc32_file.c -@@ -29,6 +29,15 @@ - # include - #endif - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - #define crc32_file attribute_hidden __libdwfl_crc32_file - #define crc32 __libdwfl_crc32 - #include diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index 360e4ee..b5aa397 100644 --- a/libdwfl/linux-kernel-modules.c -- cgit 1.2.3-korg