[llvm-branch-commits] [llvm-gcc-branch] r79548 - /llvm-gcc-4.2/branches/Apple/Leela/gcc/config/arm/arm.h

[Bill Wendling]

Author: void
Date: Thu Aug 20 13:01:49 2009
New Revision: 79548

URL: http://llvm.org/viewvc/llvm-project?rev=79548&view=rev
Log:
$ svn merge -c 79542 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r79542 into '.':
U    gcc/config/arm/arm.h


Modified:
    llvm-gcc-4.2/branches/Apple/Leela/gcc/config/arm/arm.h

Modified: llvm-gcc-4.2/branches/Apple/Leela/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Leela/gcc/config/arm/arm.h?rev=79548&r1=79547&r2=79548&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Leela/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/branches/Apple/Leela/gcc/config/arm/arm.h Thu Aug 20 13:01:49 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 */