diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/output.h | 10 | ||||
| -rw-r--r-- | gcc/varasm.c | 12 |
3 files changed, 12 insertions, 19 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6119b87..8fd9a6a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2004-09-10 Geoffrey Keating <geoffk@apple.com> + * output.h (unlikely_section_label): Delete declaration. + (unlikely_text_section_name): Likewise. + * varasm.c (unlikely_section_label_printed): Make static. + (unlikely_section_label): Likewise. + (unlikely_text_section_name): Likewise. + (assemble_start_function): Use reconcat. + * rtl.def (REG): Add comment to describe third field. 2004-09-10 Andrew Pinski <apinski@apple.com> @@ -230,7 +237,6 @@ * config/cris/cris.md ("return"): For location of return address, also check cris_return_address_on_stack. ->>>>>>> 2.5354 2004-09-09 Diego Novillo <dnovillo@redhat.com> * tree-outof-ssa.c (coalesce_abnormal_edges): Fix typo in @@ -1287,7 +1293,6 @@ config/rs6000/linux64.h: Likewise. Split out get_sigcontext function. Use ARG_POINTER_REGNUM for 32-bit temp reg too. ->>>>>>> 2.5334 2004-09-07 Jan Hubicka <jh@suse.cz> * cse.c (fold_rtx): Avoid building of diff --git a/gcc/output.h b/gcc/output.h index e832eb3..1e1d1de 100644 --- a/gcc/output.h +++ b/gcc/output.h @@ -392,10 +392,6 @@ extern const char *first_global_object_name; /* The first weak object in the file. */ extern const char *weak_global_object_name; -/* Label at start of unlikely section, when partitioning hot/cold basic - blocks. */ -extern char *unlikely_section_label; - /* Nonzero if function being compiled doesn't contain any calls (ignoring the prologue and epilogue). This is set prior to local register allocation and is valid for the remaining @@ -442,12 +438,6 @@ extern tree last_assemble_variable_decl; extern bool decl_readonly_section (tree, int); extern bool decl_readonly_section_1 (tree, int, int); -/* The following global variable indicates the section name to be used - for the current cold section, when partitioning hot and cold basic - blocks into separate sections. */ - -extern char *unlikely_text_section_name; - /* This can be used to compute RELOC for the function above, when given a constant expression. */ extern int compute_reloc_for_constant (tree); diff --git a/gcc/varasm.c b/gcc/varasm.c index 37996c0..1561dc7 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -104,19 +104,19 @@ tree last_assemble_variable_decl; partitions hot and cold basic blocks into separate sections of the .o file. */ -bool unlikely_section_label_printed = false; +static bool unlikely_section_label_printed = false; /* The following global variable indicates the label name to be put at the start of the first cold section within each function, when partitioning basic blocks into hot and cold sections. */ -char *unlikely_section_label = NULL; +static char *unlikely_section_label = NULL; /* The following global variable indicates the section name to be used for the current cold section, when partitioning hot and cold basic blocks into separate sections. */ -char *unlikely_text_section_name = NULL; +static char *unlikely_text_section_name = NULL; /* We give all constants their own alias set. Perhaps redundant with MEM_READONLY_P, but pre-dates it. */ @@ -1187,10 +1187,8 @@ assemble_start_function (tree decl, const char *fnname) unlikely_section_label_printed = false; unlikely_text_section_name = NULL; - if (unlikely_section_label) - free (unlikely_section_label); - unlikely_section_label = xmalloc ((strlen (fnname) + 18) * sizeof (char)); - sprintf (unlikely_section_label, "%s_unlikely_section", fnname); + unlikely_section_label = reconcat (unlikely_section_label, + fnname, ".unlikely_section", NULL); /* The following code does not need preprocessing in the assembler. */ |