From: Richard Henderson <rth@cygnus.com>
Date: Wed, 29 Sep 1999 23:05:46 +0000 (-0700)
Subject: rs6000.c (rs6000_encode_section_info): If ggc_p, use ggc_alloc_string.
X-Git-Tag: prereleases/libstdc++-2.92~10311
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff669a6ce0cc7ce1cc98c9c5b0d51a972d24195d;p=thirdparty%2Fgcc.git

rs6000.c (rs6000_encode_section_info): If ggc_p, use ggc_alloc_string.

        * rs6000.c (rs6000_encode_section_info): If ggc_p, use
        ggc_alloc_string.

From-SVN: r29712
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34e46329284e..3edb5af89433 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 29 16:05:18 1999  Richard Henderson  <rth@cygnus.com>
+
+	* rs6000.c (rs6000_encode_section_info): If ggc_p, use
+	ggc_alloc_string.
+
 Tue Sep 28 16:45:40 1999  David Edelsohn  <edelsohn@gnu.org>
 
 	* xcoffout.c (xcoffout_declare_function): Add documentation.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index df18201969d5..3c8b81b85ff6 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -5993,11 +5993,19 @@ rs6000_encode_section_info (decl)
 
       if (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_NT)
 	{
-	  const char *prefix = (DEFAULT_ABI == ABI_AIX) ? "." : "..";
-	  char *str = permalloc (strlen (prefix) + 1
-				 + strlen (XSTR (sym_ref, 0)));
-	  strcpy (str, prefix);
-	  strcat (str, XSTR (sym_ref, 0));
+	  size_t len1 = (DEFAULT_ABI == ABI_AIX) ? 1 : 2;
+	  size_t len2 = strlen (XSTR (sym_ref, 0));
+	  char *str;
+
+	  if (ggc_p)
+	    str = ggc_alloc_string (NULL, len1 + len2);
+	  else
+	    str = permalloc (len1 + len2 + 1);
+
+	  str[0] = '.';
+	  str[1] = '.';
+	  memcpy (str + len1, XSTR (sym_ref, 0), len2 + 1);
+
 	  XSTR (sym_ref, 0) = str;
 	}
     }
@@ -6037,9 +6045,16 @@ rs6000_encode_section_info (decl)
 		      && strcmp (name, ".PPC.EMB.sbss0") == 0))))
 	{
 	  rtx sym_ref = XEXP (DECL_RTL (decl), 0);
-	  char *str = permalloc (2 + strlen (XSTR (sym_ref, 0)));
-	  strcpy (str, "@");
-	  strcat (str, XSTR (sym_ref, 0));
+	  size_t len = strlen (XSTR (sym_ref, 0));
+	  char *str;
+
+	  if (ggc_p)
+	    str = ggc_alloc_string (NULL, len + 1);
+	  else
+	    str = permalloc (len + 2);
+	  str[0] = '@';
+	  memcpy (str + 1, XSTR (sym_ref, 0), len + 1);
+
 	  XSTR (sym_ref, 0) = str;
 	}
     }