diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 63ebfa087b1..f83983d98f1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-15  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config/bfin/elf.h (ASM_GENERATE_INTERNAL_LABEL,
+	LOCAL_LABEL_PREFIX): Delete.
+	* config/bfin/bfin.c (TARGET_ASM_INTERNAL_LABEL): Delete.
+	(bfin_internal_label): Delete.
+
 2007-06-15  Uros Bizjak  <ubizjak@gmail.com>
 
 	* libgcc2.c (CEXT): When compiling L_multc3 and L_divtc3,
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 67c0710c881..a06305beabb 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -2741,12 +2741,6 @@ bfin_rtx_costs (rtx x, int code, int outer_code, int *total)
       return false;
     }
 }
-
-static void
-bfin_internal_label (FILE *stream, const char *prefix, unsigned long num)
-{
-  fprintf (stream, "%s%s$%ld:\n", LOCAL_LABEL_PREFIX, prefix, num);
-}
 
 /* Used for communication between {push,pop}_multiple_operation (which
    we use not only as a predicate) and the corresponding output functions.  */
@@ -5360,9 +5354,6 @@ bfin_expand_builtin (tree exp, rtx target ATTRIBUTE_UNUSED,
 #undef  TARGET_ADDRESS_COST
 #define TARGET_ADDRESS_COST bfin_address_cost
 
-#undef TARGET_ASM_INTERNAL_LABEL
-#define TARGET_ASM_INTERNAL_LABEL bfin_internal_label
-
 #undef  TARGET_ASM_INTEGER
 #define TARGET_ASM_INTEGER bfin_assemble_integer
 
diff --git a/gcc/config/bfin/elf.h b/gcc/config/bfin/elf.h
index 5148c3095e9..a8ef51d060c 100644
--- a/gcc/config/bfin/elf.h
+++ b/gcc/config/bfin/elf.h
@@ -1,11 +1,5 @@
 #define OBJECT_FORMAT_ELF
 
-#define LOCAL_LABEL_PREFIX "L$"
-
-#undef ASM_GENERATE_INTERNAL_LABEL
-#define ASM_GENERATE_INTERNAL_LABEL(LABEL, PREFIX, NUM)		\
-     sprintf (LABEL, "*%s%s$%d", LOCAL_LABEL_PREFIX, PREFIX, (int) NUM)
-
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC "\
 %{msim:%{!shared:crt0%O%s}} \