diff options
author | DJ Delorie <dj@redhat.com> | 2011-07-25 17:11:48 +0000 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2011-07-25 17:11:48 +0000 |
commit | 17a16b0f109f8663ff1e84a74dce5dee1707bf61 (patch) | |
tree | 516db429edb2edd2455993ef9be023b8acda4e50 | |
parent | 543305c9cd7417b50b1e6d1fce6c7e0e44741bf4 (diff) | |
download | gdb-17a16b0f109f8663ff1e84a74dce5dee1707bf61.zip gdb-17a16b0f109f8663ff1e84a74dce5dee1707bf61.tar.gz gdb-17a16b0f109f8663ff1e84a74dce5dee1707bf61.tar.bz2 |
merge from gcc
-rw-r--r-- | include/ChangeLog | 4 | ||||
-rw-r--r-- | include/xregex.h | 1 | ||||
-rw-r--r-- | libiberty/ChangeLog | 5 | ||||
-rw-r--r-- | libiberty/stack-limit.c | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 255806e..53984e1 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 645195b..4c5ef93 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 689d507..97c50c0 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 28541b1..e64cac2 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 |