diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c13d7f8d77a..8ad8dd7dce7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-29  Caroline Tice  <ctice@apple.com>
+
+	Fix PR 21956
+	* varasm.c (assemble_start_function):  Add "L" to beginning of
+	local labels, so assembler & linker treat them as local.
+	
 2005-06-29  Richard Henderson  <rth@redhat.com>
 
 	* config/i386/i386.c (ix86_expand_int_vcond): Remove unsignedp
diff --git a/gcc/varasm.c b/gcc/varasm.c
index e5d36498051..3c1eb115235 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1234,13 +1234,13 @@ assemble_start_function (tree decl, const char *fnname)
   first_function_block_is_cold = false;
   if (flag_reorder_blocks_and_partition)
     {
-      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "HOTB", const_labelno);
+      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "LHOTB", const_labelno);
       cfun->hot_section_label = ggc_strdup (tmp_label);
-      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "COLDB", const_labelno);
+      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "LCOLDB", const_labelno);
       cfun->cold_section_label = ggc_strdup (tmp_label);
-      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "HOTE", const_labelno);
+      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "LHOTE", const_labelno);
       cfun->hot_section_end_label = ggc_strdup (tmp_label);
-      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "COLDE", const_labelno);
+      ASM_GENERATE_INTERNAL_LABEL (tmp_label, "LCOLDE", const_labelno);
       cfun->cold_section_end_label = ggc_strdup (tmp_label);
       const_labelno++;
     }