diff options
| author | Jason Merrill <jason@redhat.com> | 2001-03-21 19:53:50 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2001-03-21 19:53:50 -0500 |
| commit | 64d9c3fede833ead77f8379349cf1dfabfe7f69c (patch) | |
| tree | 371485407c31108950fa8442cc454dd40ecbd81e /gcc | |
| parent | 52d76e11287d0e4c7d9464cc4a5d4462da1425d2 (diff) | |
| download | gcc-64d9c3fede833ead77f8379349cf1dfabfe7f69c.zip gcc-64d9c3fede833ead77f8379349cf1dfabfe7f69c.tar.gz gcc-64d9c3fede833ead77f8379349cf1dfabfe7f69c.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/collect2.c | 12 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/error.c | 10 | ||||
| -rw-r--r-- | gcc/tree.c | 8 | ||||
| -rw-r--r-- | gcc/varasm.c | 10 |
6 files changed, 13 insertions, 38 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64cdf7b..1c45346 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -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 diff --git a/gcc/collect2.c b/gcc/collect2.c index 729d62d..732ed4b 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -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. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0c47691..578d0b1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 0ab06fa..fc2ee35 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -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) @@ -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. diff --git a/gcc/varasm.c b/gcc/varasm.c index 380df02..694b0b0 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -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. */ |