collect2.c (is_ctor_dtor): Always use '_' in the file fn names, not '.' or '$'.

* collect2.c (is_ctor_dtor): Always use '_' in the file fn names,
        not '.' or '$'.
        * tree.c (FILE_FUNCTION_FORMAT): Likewise.
        * varasm.c (CHKR_PREFIX): Likewise.

        * error.c (GLOBAL_THING): Always use '__'.

From-SVN: r40723
This commit is contained in:
Jason Merrill 2001-03-21 19:53:50 -05:00 committed by Jason Merrill
parent 52d76e1128
commit 64d9c3fede
6 changed files with 13 additions and 38 deletions

View File

@ -1,3 +1,10 @@
2001-03-20 Jason Merrill <jason@redhat.com>
* collect2.c (is_ctor_dtor): Always use '_' in the file fn names,
not '.' or '$'.
* tree.c (FILE_FUNCTION_FORMAT): Likewise.
* varasm.c (CHKR_PREFIX): Likewise.
Wed Mar 21 14:27:11 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* gcse.c (hash_scan_set): An expression is not anticipatible if it

View File

@ -589,21 +589,9 @@ is_ctor_dtor (s)
register const char *orig_s = s;
static struct names special[] = {
#ifdef NO_DOLLAR_IN_LABEL
#ifdef NO_DOT_IN_LABEL
{ "GLOBAL__I_", sizeof ("GLOBAL__I_")-1, 1, 0 },
{ "GLOBAL__D_", sizeof ("GLOBAL__D_")-1, 2, 0 },
{ "GLOBAL__F_", sizeof ("GLOBAL__F_")-1, 5, 0 },
#else
{ "GLOBAL_.I.", sizeof ("GLOBAL_.I.")-1, 1, 0 },
{ "GLOBAL_.D.", sizeof ("GLOBAL_.D.")-1, 2, 0 },
{ "GLOBAL_.F.", sizeof ("GLOBAL_.F.")-1, 5, 0 },
#endif
#else
{ "GLOBAL_$I$", sizeof ("GLOBAL_$I$")-1, 1, 0 },
{ "GLOBAL_$D$", sizeof ("GLOBAL_$D$")-1, 2, 0 },
{ "GLOBAL_$F$", sizeof ("GLOBAL_$F$")-1, 5, 0 },
#endif
{ "GLOBAL__FI_", sizeof ("GLOBAL__FI_")-1, 3, 0 },
{ "GLOBAL__FD_", sizeof ("GLOBAL__FD_")-1, 4, 0 },
#ifdef CFRONT_LOSSAGE /* Do not collect cfront initialization functions.

View File

@ -1,3 +1,7 @@
2001-03-20 Jason Merrill <jason@redhat.com>
* error.c (GLOBAL_THING): Always use '__'.
2001-03-21 Mark Mitchell <mark@codesourcery.com>
* class.c (build_clone): Clear DECL_ASSEMBLER_NAME.

View File

@ -873,15 +873,7 @@ ident_fndecl (t)
return NULL_TREE;
}
#ifndef NO_DOLLAR_IN_LABEL
# define GLOBAL_THING "_GLOBAL_$"
#else
# ifndef NO_DOT_IN_LABEL
# define GLOBAL_THING "_GLOBAL_."
# else
# define GLOBAL_THING "_GLOBAL__"
# endif
#endif
#define GLOBAL_THING "_GLOBAL__"
static void
dump_global_iord (t)

View File

@ -4448,15 +4448,7 @@ dump_tree_statistics ()
#define FILE_FUNCTION_PREFIX_LEN 9
#ifndef NO_DOLLAR_IN_LABEL
#define FILE_FUNCTION_FORMAT "_GLOBAL_$%s$%s"
#else /* NO_DOLLAR_IN_LABEL */
#ifndef NO_DOT_IN_LABEL
#define FILE_FUNCTION_FORMAT "_GLOBAL_.%s.%s"
#else /* NO_DOT_IN_LABEL */
#define FILE_FUNCTION_FORMAT "_GLOBAL__%s_%s"
#endif /* NO_DOT_IN_LABEL */
#endif /* NO_DOLLAR_IN_LABEL */
/* Appends 6 random characters to TEMPLATE to (hopefully) avoid name
clashes in cases where we can't reliably choose a unique name.

View File

@ -61,15 +61,7 @@ Boston, MA 02111-1307, USA. */
#endif
/* Define the prefix to use when check_memory_usage_flag is enable. */
#ifdef NO_DOLLAR_IN_LABEL
#ifdef NO_DOT_IN_LABEL
#define CHKR_PREFIX "chkr_prefix_"
#else /* !NO_DOT_IN_LABEL */
#define CHKR_PREFIX "chkr."
#endif
#else /* !NO_DOLLAR_IN_LABEL */
#define CHKR_PREFIX "chkr$"
#endif
#define CHKR_PREFIX "_CHKR_"
#define CHKR_PREFIX_SIZE (sizeof (CHKR_PREFIX) - 1)
/* File in which assembler code is being written. */