1 files changed, 108 insertions, 0 deletions
diff --git a/main/elfutils/0001-Fix-TEMP_FAILURE_RETRY-definition-when-not-defined.patch b/main/elfutils/0001-Fix-TEMP_FAILURE_RETRY-definition-when-not-defined.patch
new file mode 100644
index 0000000000..5a1182d80a
--- /dev/null
+++ b/main/elfutils/0001-Fix-TEMP_FAILURE_RETRY-definition-when-not-defined.patch
@@ -0,0 +1,108 @@
+From 925f67e86d127c8917f92bde1cf5abd5b07d0768 Mon Sep 17 00:00:00 2001
+From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Date: Thu, 29 Dec 2016 21:02:57 -0200
+Subject: [PATCH] Fix TEMP_FAILURE_RETRY definition when not defined.
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=21001
+
+Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+---
+ lib/ChangeLog                    | 5 +++++
+ lib/crc32_file.c                 | 1 +
+ lib/system.h                     | 2 +-
+ libdwfl/ChangeLog                | 6 ++++++
+ libdwfl/dwfl_build_id_find_elf.c | 1 +
+ libdwfl/dwfl_module_getdwarf.c   | 1 +
+ libdwfl/libdwfl_crc32_file.c     | 1 -
+ 7 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ChangeLog b/lib/ChangeLog
+index 1fe59067..fcf5b105 100644
+--- a/lib/ChangeLog
++++ b/lib/ChangeLog
+@@ -1,3 +1,8 @@
++2016-12-29  Luiz Angelo Daros de Luca  <luizluca@gmail.com>
++
++	* crc32_file.c: Include system.h.
++	* system.h: Remove semi-colon after TEMP_FAILURE_RETRY definition.
++
+ 2016-12-24  Mark Wielaard  <mark@klomp.org>
+ 
+ 	* version.c: New source file.
+diff --git a/lib/crc32_file.c b/lib/crc32_file.c
+index a8434d42..57e42980 100644
+--- a/lib/crc32_file.c
++++ b/lib/crc32_file.c
+@@ -35,6 +35,7 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include "system.h"
+ 
+ int
+ crc32_file (int fd, uint32_t *resp)
+diff --git a/lib/system.h b/lib/system.h
+index ccd99d63..dde7c4a2 100644
+--- a/lib/system.h
++++ b/lib/system.h
+@@ -81,7 +81,7 @@
+      do \
+        __res = expression; \
+      while (__res == -1 && errno == EINTR); \
+-     __res; });
++     __res; })
+ #endif
+ 
+ static inline ssize_t __attribute__ ((unused))
+diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
+index bc627fee..57671eaf 100644
+--- a/libdwfl/ChangeLog
++++ b/libdwfl/ChangeLog
+@@ -1,3 +1,9 @@
++2016-12-29  Luiz Angelo Daros de Luca  <luizluca@gmail.com>
++
++	* dwfl_build_id_find_elf.c: Include system.h.
++	* dwfl_module_getdwarf.c: Likewise.
++	* libdwfl_crc32_file.c: Don't define LIB_SYSTEM_H.
++
+ 2016-11-23  Mark Wielaard  <mjw@redhat.com>
+ 
+ 	* linux-kernel-modules.c: Only include fts.h early if BAD_FTS is
+diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
+index 903e1931..d4737c9f 100644
+--- a/libdwfl/dwfl_build_id_find_elf.c
++++ b/libdwfl/dwfl_build_id_find_elf.c
+@@ -30,6 +30,7 @@
+ #include <inttypes.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include "system.h"
+ 
+ 
+ int
+diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
+index 0e8810b1..46caece5 100644
+--- a/libdwfl/dwfl_module_getdwarf.c
++++ b/libdwfl/dwfl_module_getdwarf.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include "../libdw/libdwP.h"	/* DWARF_E_* values are here.  */
+ #include "../libelf/libelfP.h"
++#include "system.h"
+ 
+ static inline Dwfl_Error
+ open_elf_file (Elf **elf, int *fd, char **name)
+diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
+index 6b6b7d3f..f849128d 100644
+--- a/libdwfl/libdwfl_crc32_file.c
++++ b/libdwfl/libdwfl_crc32_file.c
+@@ -31,6 +31,5 @@
+ 
+ #define crc32_file attribute_hidden __libdwfl_crc32_file
+ #define crc32 __libdwfl_crc32
+-#define LIB_SYSTEM_H	1
+ #include <libdwflP.h>
+ #include "../lib/crc32_file.c"
+-- 
+2.11.1
+