--- config/darwin.h.~1~	2010-07-01 07:47:13.000000000 -0700
+++ config/darwin.h	2010-07-08 13:18:10.000000000 -0700
@@ -628,7 +628,7 @@ extern GTY(()) int darwin_ms_struct;
 	 && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))		\
         || DECL_INITIAL (DECL))						\
       (* targetm.encode_section_info) (DECL, DECL_RTL (DECL), false);	\
-    ASM_OUTPUT_LABEL (FILE, xname);					\
+    ASM_OUTPUT_HOTFIX_LABEL (FILE, xname, DECL);			\
     /* Darwin doesn't support zero-size objects, so give them a		\
        byte.  */							\
     if (tree_low_cst (DECL_SIZE_UNIT (DECL), 1) == 0)			\
@@ -649,7 +649,7 @@ extern GTY(()) int darwin_ms_struct;
 	 && (!DECL_COMMON (DECL) || !TREE_PUBLIC (DECL)))		\
         || DECL_INITIAL (DECL))						\
       (* targetm.encode_section_info) (DECL, DECL_RTL (DECL), false);	\
-    ASM_OUTPUT_LABEL (FILE, xname);					\
+    ASM_OUTPUT_HOTFIX_LABEL (FILE, xname, DECL);					\
   } while (0)
 
 #undef TARGET_ASM_DECLARE_CONSTANT_NAME