diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-02-08 14:27:31 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-02-08 14:27:31 +0100 |
| commit | 9e66e106ab1018782aba2630f01a059cb3c839d1 (patch) | |
| tree | 555df8dabc4c9d0caf61c53fd5283f58d15974f5 /gcc/coverage.c | |
| parent | bd73623c908777daae42b70ee841e9c84fa7b9b4 (diff) | |
| download | gcc-9e66e106ab1018782aba2630f01a059cb3c839d1.zip gcc-9e66e106ab1018782aba2630f01a059cb3c839d1.tar.gz gcc-9e66e106ab1018782aba2630f01a059cb3c839d1.tar.bz2 | |
re PR gcov-profile/52150 (junk at end of line in Firefox PGO build)
PR gcov-profile/52150
* coverage.c: Include target.h.
(build_var): Call targetm.strip_name_encoding on the assembler name.
Change one _ into . or $ if the target allows it.
* Makefile.in (coverage.o): Depend on $(TARGET_H).
* gcc.dg/tree-prof/pr52150.c: New test.
From-SVN: r184006
Diffstat (limited to 'gcc/coverage.c')
| -rw-r--r-- | gcc/coverage.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/gcc/coverage.c b/gcc/coverage.c index 091e7e3..ce8b175 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -1,6 +1,6 @@ /* Read and write coverage files, and associated functionality. Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, - 2000, 2001, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 + 2000, 2001, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Contributed by James E. Wilson, UC Berkeley/Cygnus Support; based on some ideas from Dain Samples of UC Berkeley. @@ -50,6 +50,7 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic-core.h" #include "intl.h" #include "filenames.h" +#include "target.h" #include "gcov-io.h" #include "gcov-io.c" @@ -656,13 +657,25 @@ static tree build_var (tree fn_decl, tree type, int counter) { tree var = build_decl (BUILTINS_LOCATION, VAR_DECL, NULL_TREE, type); - tree fn_name = DECL_ASSEMBLER_NAME (fn_decl); - char *buf = (char *)alloca (IDENTIFIER_LENGTH (fn_name) + 10); + const char *fn_name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fn_decl)); + char *buf; + size_t fn_name_len, len; + + fn_name = targetm.strip_name_encoding (fn_name); + fn_name_len = strlen (fn_name); + buf = XALLOCAVEC (char, fn_name_len + 8 + sizeof (int) * 3); if (counter < 0) - sprintf (buf, "__gcov__%s", IDENTIFIER_POINTER (fn_name)); + strcpy (buf, "__gcov__"); else - sprintf (buf, "__gcov%u_%s", counter, IDENTIFIER_POINTER (fn_name)); + sprintf (buf, "__gcov%u_", counter); + len = strlen (buf); +#ifndef NO_DOT_IN_LABEL + buf[len - 1] = '.'; +#elif !defined NO_DOLLAR_IN_LABEL + buf[len - 1] = '$'; +#endif + memcpy (buf + len, fn_name, fn_name_len + 1); DECL_NAME (var) = get_identifier (buf); TREE_STATIC (var) = 1; TREE_ADDRESSABLE (var) = 1; |