From 16f138a49ad1815e113d2b5b7a87f26999ade811 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue, 29 Aug 2017 16:31:08 +0100
Subject: [PATCH] [AArch64] Fix procfs.h not to expose stdint.h types

Commit 39e7a5a66828a60008543db5f03f46dc7081668b added stdint.h
to sys/procfs.h, but it is included into signal.h by default and
there is code that does not expect stdint.h to be visible there,
so use __uint64_t instead of uint64_t.
---
 ChangeLog                                    | 4 ++++
 sysdeps/unix/sysv/linux/aarch64/sys/procfs.h | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf89b59a55..07cf8dd84d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-29  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* sysdeps/unix/sysv/linux/aarch64/sys/procfs.h: Use __uint64_t.
+
 2017-08-29  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #22026]
diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h b/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
index 5c96bc5f17..44d32ca6ba 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/procfs.h
@@ -32,12 +32,11 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/user.h>
-#include <stdint.h>
 
 __BEGIN_DECLS
 
 /* Type for a general-purpose register.  */
-typedef uint64_t elf_greg_t;
+typedef __uint64_t elf_greg_t;
 
 /* And the whole bunch of them.  We could have used `struct
    pt_regs' directly in the typedef, but tradition says that
-- 
2.11.4.GIT