From 17a16b0f109f8663ff1e84a74dce5dee1707bf61 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Mon, 25 Jul 2011 17:11:48 +0000
Subject: [PATCH] merge from gcc

---
 include/ChangeLog       | 4 ++++
 include/xregex.h        | 1 +
 libiberty/ChangeLog     | 5 +++++
 libiberty/stack-limit.c | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/include/ChangeLog b/include/ChangeLog
index 255806efb3a..53984e1c01a 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* xregex.h (regoff_t): Define.
+
 2011-07-22  Jakub Jelinek  <jakub@redhat.com>
 
 	* dwarf2.h (DW_AT_GNU_macros): New.
diff --git a/include/xregex.h b/include/xregex.h
index 645195bbceb..4c5ef934556 100644
--- a/include/xregex.h
+++ b/include/xregex.h
@@ -8,6 +8,7 @@
 #  define regexec xregexec
 #  define regcomp xregcomp
 #  define regerror xregerror
+#  define regoff_t xregoff_t
 #  define re_set_registers xre_set_registers
 #  define re_match_2 xre_match_2
 #  define re_match xre_match
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 689d507cdde..97c50c0ea7d 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	PR target/49817
+	* stack-limit.c: Include <stdint.h>.
+
 2011-07-22  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/49756
diff --git a/libiberty/stack-limit.c b/libiberty/stack-limit.c
index 28541b1d423..e64cac28d1d 100644
--- a/libiberty/stack-limit.c
+++ b/libiberty/stack-limit.c
@@ -35,6 +35,9 @@ Attempt to increase stack size limit to @var{pref} bytes if possible.
 
 #include "config.h"
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
-- 
2.30.2