aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meissner <meissner@linux.vnet.ibm.com>2011-07-22 15:49:08 +0000
committerMichael Meissner <meissner@gcc.gnu.org>2011-07-22 15:49:08 +0000
commite56fa6bb1265f0ceaeeb49d01d51786d6941a2ed (patch)
tree5e2ed55bc69a0a699f43db1c3ee34dcc984678f2
parentb75d1e2107d37a1a6d0fb3b3adc56a275ed711bf (diff)
downloadgcc-e56fa6bb1265f0ceaeeb49d01d51786d6941a2ed.zip
gcc-e56fa6bb1265f0ceaeeb49d01d51786d6941a2ed.tar.gz
gcc-e56fa6bb1265f0ceaeeb49d01d51786d6941a2ed.tar.bz2
Allow linux ppc to bootstrap again
From-SVN: r176631
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/rs6000/rs6000.c11
2 files changed, 11 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aae9d08..44cbfae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-20 Michael Meissner <meissner@linux.vnet.ibm.com>
+
+ * config/rs6000/rs6000.c (rs6000_xcoff_strip_dollar): Rewrite to
+ avoid warnings when GCC is built with a C++ compiler.
+
2011-07-22 Martin Jambor <mjambor@suse.cz>
PR lto/49796
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 20b3cb8..0d4e6d5 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -21894,17 +21894,18 @@ const char *
rs6000_xcoff_strip_dollar (const char *name)
{
char *strip, *p;
- int len;
+ const char *q;
+ size_t len;
- p = strchr (name, '$');
+ q = (const char *) strchr (name, '$');
- if (p == 0 || p == name)
+ if (q == 0 || q == name)
return name;
len = strlen (name);
- strip = (char *) alloca (len + 1);
+ strip = XALLOCAVEC (char, len + 1);
strcpy (strip, name);
- p = strchr (strip, '$');
+ p = strip + (q - name);
while (p)
{
*p = '_';