aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edelsohn <edelsohn@gnu.org>2008-10-21 17:33:53 +0000
committerDavid Edelsohn <dje@gcc.gnu.org>2008-10-21 13:33:53 -0400
commit3b8031bb3103422ccfebb62991dfc64054cd9eac (patch)
tree290b854625db0020fbcc255a9d3ce22bab853716
parent3027350e73e58ea1f808d6ce005044e58777692f (diff)
downloadgcc-3b8031bb3103422ccfebb62991dfc64054cd9eac.zip
gcc-3b8031bb3103422ccfebb62991dfc64054cd9eac.tar.gz
gcc-3b8031bb3103422ccfebb62991dfc64054cd9eac.tar.bz2
re PR java/35485 (libjava is disabled by default)
PR target/35485 * tree.c (get_file_function_name): Copy first_global_object_name. Centralize call to clean_symbol_name. From-SVN: r141269
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/tree.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 83cffde..455fcd9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-21 David Edelsohn <edelsohn@gnu.org>
+
+ PR target/35485
+ * tree.c (get_file_function_name): Copy first_global_object_name.
+ Centralize call to clean_symbol_name.
+
2008-10-21 Sandra Loosemore <sandra@codesourcery.com>
* config.gcc (powerpc-*): Make t-ppcgas imply usegas.h.
diff --git a/gcc/tree.c b/gcc/tree.c
index 7064e06..925eafe 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -6923,7 +6923,7 @@ get_file_function_name (const char *type)
/* If we already have a name we know to be unique, just use that. */
if (first_global_object_name)
- p = first_global_object_name;
+ p = q = ASTRDUP (first_global_object_name);
/* If the target is handling the constructors/destructors, they
will be local to this file and the name is only necessary for
debugging purposes. */
@@ -6940,7 +6940,6 @@ get_file_function_name (const char *type)
else
p = file;
p = q = ASTRDUP (p);
- clean_symbol_name (q);
}
else
{
@@ -6959,7 +6958,6 @@ get_file_function_name (const char *type)
len = strlen (file);
q = (char *) alloca (9 * 2 + len + 1);
memcpy (q, file, len + 1);
- clean_symbol_name (q);
sprintf (q + len, "_%08X_%08X", crc32_string (0, name),
crc32_string (0, get_random_seed (false)));
@@ -6967,6 +6965,7 @@ get_file_function_name (const char *type)
p = q;
}
+ clean_symbol_name (q);
buf = (char *) alloca (sizeof (FILE_FUNCTION_FORMAT) + strlen (p)
+ strlen (type));