From: John David Anglin Date: Mon, 16 Jan 2006 02:26:42 +0000 (+0000) Subject: re PR target/25168 (FAIL: g++.old-deja/g++.abi/cxa_vec.C execution test) X-Git-Tag: releases/gcc-4.2.0~4855 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e21d6c600c0e4c27d89e59bed687fa5e0861f4ca;p=thirdparty%2Fgcc.git re PR target/25168 (FAIL: g++.old-deja/g++.abi/cxa_vec.C execution test) PR target/25168 * tree.c (get_file_function_name_long): Concatenate the first global object name with a string derived from the input filename of the object for type "F". From-SVN: r109740 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9ffd7307473d..9d337327be7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2006-01-15 John David Anglin + + PR target/25168 + * tree.c (get_file_function_name_long): Concatenate the first global + object name with a string derived from the input filename of the object + for type "F". + 2006-01-16 Ben Elliston * config/i386/winnt-stubs.c: Update FSF address. diff --git a/gcc/tree.c b/gcc/tree.c index 0cca7579ee1b..9aaba7e4c26a 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -5867,7 +5867,26 @@ get_file_function_name_long (const char *type) char *q; if (first_global_object_name) - p = first_global_object_name; + { + p = first_global_object_name; + + /* For type 'F', the generated name must be unique not only to this + translation unit but also to any given link. Since global names + can be overloaded, we concatenate the first global object name + with a string derived from the file name of this object. */ + if (!strcmp (type, "F")) + { + const char *file = main_input_filename; + + if (! file) + file = input_filename; + + q = alloca (strlen (p) + 10); + sprintf (q, "%s_%08X", p, crc32_string (0, file)); + + p = q; + } + } else { /* We don't have anything that we know to be unique to this translation