[llvm-branch-commits] [llvm-gcc-branch] r108880 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/decl.c

[Dale Johannesen]

Author: johannes
Date: Tue Jul 20 13:45:05 2010
New Revision: 108880

URL: http://llvm.org/viewvc/llvm-project?rev=108880&view=rev
Log:
--- Merging r108732 into '.':
U    gcc/cp/decl.c


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/decl.c

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/decl.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/decl.c?rev=108880&r1=108879&r2=108880&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/decl.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/cp/decl.c Tue Jul 20 13:45:05 2010
@@ -377,7 +377,10 @@
 	  /* Avoid crashing later.  */
 	  define_label (location, DECL_NAME (label));
 	}
-      else if (!TREE_USED (label))
+/* LLVM LOCAL begin 8204109 */
+      else if (!TREE_USED (label) &&
+               strncmp (IDENTIFIER_POINTER (DECL_NAME (label)), "LASM$", 5) != 0)
+/* LLVM LOCAL end */
 	warning (OPT_Wunused_label, "label %q+D defined but not used", label);
     }