[llvm-commits] [llvm-gcc-4.2] r59994 - in /llvm-gcc-4.2/trunk/gcc: config/darwin.h llvm-backend.cpp

[Bill Wendling]

Author: void
Date: Mon Nov 24 17:43:34 2008
New Revision: 59994

URL: http://llvm.org/viewvc/llvm-project?rev=59994&view=rev
Log:
Move check inside of the macro.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.h
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Mon Nov 24 17:43:34 2008
@@ -701,7 +701,8 @@
    expects the name to be internal. Give it an internal name here.  */
 #define TARGET_ADJUST_CFSTRING_NAME(GV, SEC)                            \
   do {                                                                  \
-    if (strcmp((SEC), "__DATA, __cfstring") == 0) {                     \
+    if (!GV->hasName() && GV->hasInternalLinkage() &&                   \
+        strcmp((SEC), "__DATA, __cfstring") == 0) {                     \
       static unsigned i = 0;                                            \
       const char *fmt = "\01L_unnamed_cfstring_%d";                     \
       char *N = (char *)alloca(strlen(fmt) + 37);                       \

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=59994&r1=59993&r2=59994&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Nov 24 17:43:34 2008
@@ -1136,8 +1136,7 @@
 
       /* LLVM LOCAL - begin radar 6389998 */
 #ifdef TARGET_ADJUST_CFSTRING_NAME
-      if (!GV->hasName() && GV->hasInternalLinkage())
-        TARGET_ADJUST_CFSTRING_NAME(GV, Section);
+      TARGET_ADJUST_CFSTRING_NAME(GV, Section);
 #endif
       /* LLVM LOCAL - end radar 6389998 */
     }