aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@redhat.com>2009-09-01 08:45:38 +0000
committerDodji Seketeli <dodji@gcc.gnu.org>2009-09-01 10:45:38 +0200
commitd3bc57f2818b12de38aaaa41dcfecf80dd3114e3 (patch)
tree37d685fa90f26d4f9c6dc3f84512e93c747c67cf
parent71c00b5c9996d96beed71c4998df027363b19091 (diff)
downloadgcc-d3bc57f2818b12de38aaaa41dcfecf80dd3114e3.zip
gcc-d3bc57f2818b12de38aaaa41dcfecf80dd3114e3.tar.gz
gcc-d3bc57f2818b12de38aaaa41dcfecf80dd3114e3.tar.bz2
Fix bootstrap after patch PR debug/30161
gcc/ChangeLog: PR bootstrap/41205 Fix AIX bootstrap after PR debug/30161 * dwarf2out.c (make_ith_pack_parameter_name): Don't used strnlen that is a GNU extension. (tmpl_value_parm_die_table): Move the definition of this global outside #ifdef DWARF2_DEBUGGING_INFO region. gcc/cp/ChangeLog: PR bootstrap/41205 * pt.c (make_ith_pack_parameter_name): Don't use strnlen that is a GNU extension. From-SVN: r151262
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c2
-rw-r--r--gcc/dwarf2out.c6
4 files changed, 19 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc65f0e..746ff69 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-01 Dodji Seketeli <dodji@redhat.com>
+
+ PR bootstrap/41205
+ Fix AIX bootstrap after PR debug/30161
+ * dwarf2out.c (make_ith_pack_parameter_name): Don't used strnlen
+ that is a GNU extension.
+ (tmpl_value_parm_die_table): Move the definition of this global
+ outside #ifdef DWARF2_DEBUGGING_INFO region.
+
2009-09-01 Richard Guenther <rguenther@suse.de>
* tree.c (tree_expr_size): New function.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b391672..c867822 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-01 Dodji Seketeli <dodji@redhat.com>
+
+ PR bootstrap/41205
+ * pt.c (make_ith_pack_parameter_name): Don't use strnlen that is a
+ GNU extension.
+
2009-09-01 Richard Guenther <rguenther@suse.de>
* cp-objcp-common.c (cp_expr_size): Use tree_expr_size.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 03b89fa..5d48b1f 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -2668,7 +2668,7 @@ make_ith_pack_parameter_name (tree name, int i)
snprintf (numbuf, NUMBUF_LEN, "%i", i);
newname_len = IDENTIFIER_LENGTH (name)
- + strnlen (numbuf, NUMBUF_LEN) + 2;
+ + strlen (numbuf) + 2;
newname = (char*)alloca (newname_len);
snprintf (newname, newname_len,
"%s#%i", IDENTIFIER_POINTER (name), i);
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index c9c0188..0dfe4f6 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -5693,14 +5693,14 @@ static GTY(()) int label_num;
/* Cached result of previous call to lookup_filename. */
static GTY(()) struct dwarf_file_data * file_table_last_lookup;
+static GTY(()) VEC(die_arg_entry,gc) *tmpl_value_parm_die_table;
+
#ifdef DWARF2_DEBUGGING_INFO
/* Offset from the "steady-state frame pointer" to the frame base,
within the current function. */
static HOST_WIDE_INT frame_pointer_fb_offset;
-static GTY(()) VEC(die_arg_entry,gc) *tmpl_value_parm_die_table;
-
/* Forward declarations for functions defined in this file. */
static int is_pseudo_reg (const_rtx);
@@ -10387,7 +10387,7 @@ make_ith_pack_parameter_name (tree name, int i)
snprintf (numbuf, NUMBUF_LEN, "%i", i);
newname_len = IDENTIFIER_LENGTH (name)
- + strnlen (numbuf, NUMBUF_LEN) + 2;
+ + strlen (numbuf) + 2;
newname = (char*) alloca (newname_len);
snprintf (newname, newname_len,
"%s#%i", IDENTIFIER_POINTER (name), i);