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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151262 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc65f0e..746ff69 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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);