aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-06 02:10:46 -0400
committerMike Frysinger <vapier@gentoo.org>2015-08-07 23:40:19 -0400
commit8415fb8d4f05c023b9d79e44dff197cc285fd1e5 (patch)
treef9b4f864687d0a1a6b128a515325c5dbb7c151eb
parentf903b287fea685366c0c8b59b01a1df940553458 (diff)
downloadglibc-8415fb8d4f05c023b9d79e44dff197cc285fd1e5.tar
glibc-8415fb8d4f05c023b9d79e44dff197cc285fd1e5.tar.gz
glibc-8415fb8d4f05c023b9d79e44dff197cc285fd1e5.tar.bz2
glibc-8415fb8d4f05c023b9d79e44dff197cc285fd1e5.zip
microblaze: include unix/sysdep.h
The semi-recent SYSCALL_CANCEL inclusion broke microblaze due to the sysdep.h header not including the unix/sysdep.h header. Include it here like all other ports. (cherry picked from commit 5d5de49c3ccd69f65b801f1ca490a0112d1cbd7d)
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/sysdep.h7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index adde3e23f1..9b1f3cb735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-08 Mike Frysinger <vapier@gentoo.org>
+
+ * sysdeps/unix/sysv/linux/microblaze/sysdep.h: Wrap the whole file
+ in _LINUX_MICROBLAZE_SYSDEP_H defines. Include sysdeps/unix/sysdep.h
+ and delete sys/syscall.h include.
+
2015-08-07 Mike Frysinger <vapier@gentoo.org>
* sysdeps/hppa/dl-symaddr.c (_dl_symbol_address): Add rtld_hidden_def.
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
index 83c0340a25..9d5c542633 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
@@ -16,8 +16,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#ifndef _LINUX_MICROBLAZE_SYSDEP_H
+#define _LINUX_MICROBLAZE_SYSDEP_H 1
+
+#include <sysdeps/unix/sysdep.h>
#include <sysdeps/microblaze/sysdep.h>
-#include <sys/syscall.h>
/* Defines RTLD_PRIVATE_ERRNO. */
#include <dl-sysdep.h>
@@ -305,3 +308,5 @@ SYSCALL_ERROR_LABEL_DCL: \
# define PTR_DEMANGLE(var) (void) (var)
#endif /* not __ASSEMBLER__ */
+
+#endif /* _LINUX_MICROBLAZE_SYSDEP_H */