[llvm-commits] [llvm-gcc-4.2] r79542 - /llvm-gcc-4.2/trunk/gcc/config/arm/arm.h

[Bob Wilson]

Author: bwilson
Date: Thu Aug 20 12:18:38 2009
New Revision: 79542

URL: http://llvm.org/viewvc/llvm-project?rev=79542&view=rev
Log:
Propagate the LLVM-specific change to default_strip_name_encoding (from
gcc/varasm.c) to the ARM version in arm_strip_name_encoding.  This fixes
a problem where duplicate symbol declarations with asm renaming cause
warnings because the extra '\1' character is not stripped off and it
looks like the asm renaming is not the same.  Radar 7155137.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.h

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.h?rev=79542&r1=79541&r2=79542&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Thu Aug 20 12:18:38 2009
@@ -2163,6 +2163,16 @@
 #define SUBTARGET_NAME_ENCODING_LENGTHS
 #endif
 
+/* LLVM LOCAL begin default name encoding */
+#ifndef ENABLE_LLVM
+#define DEFAULT_NAME_ENCODING_LENGTHS		\
+  case '*':  return 1;
+#else
+#define DEFAULT_NAME_ENCODING_LENGTHS		\
+  case '\1':  return 1;
+#endif
+/* LLVM LOCAL end default name encoding */
+
 /* This is a C fragment for the inside of a switch statement.
    Each case label should return the number of characters to
    be stripped from the start of a function's name, if that
@@ -2170,14 +2180,14 @@
 /* LLVM LOCAL */
 #if TARGET_MACHO
 #define ARM_NAME_ENCODING_LENGTHS		\
-  case '*':  return 1;				\
+  DEFAULT_NAME_ENCODING_LENGTHS			\
   SUBTARGET_NAME_ENCODING_LENGTHS
 /* LLVM LOCAL begin name encoding */
 #else
 #define ARM_NAME_ENCODING_LENGTHS		\
   case SHORT_CALL_FLAG_CHAR: return 1;		\
   case LONG_CALL_FLAG_CHAR:  return 1;		\
-  case '*':  return 1;				\
+  DEFAULT_NAME_ENCODING_LENGTHS			\
   SUBTARGET_NAME_ENCODING_LENGTHS
 #endif
 /* LLVM LOCAL end name encoding */