merge from gcc

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.

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

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

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