[llvm-branch-commits] [llvm-gcc-branch] r71251 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp

[Bill Wendling]

Author: void
Date: Fri May  8 15:23:31 2009
New Revision: 71251

URL: http://llvm.org/viewvc/llvm-project?rev=71251&view=rev
Log:
--- Merging r71249 into 'gcc/llvm-backend.cpp':
U    gcc/llvm-backend.cpp

Conditionalize checking for ObjC prefix on whether this is an ObjC program.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp?rev=71251&r1=71250&r2=71251&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp Fri May  8 15:23:31 2009
@@ -1394,8 +1394,9 @@
     const char LPrefix[] = "\01L_OBJC_";
     const char lPrefix[] = "\01l_OBJC_";
 
-    if (strncmp(Name, LPrefix, sizeof(LPrefix) - 1) != 0 &&
-        strncmp(Name, lPrefix, sizeof(lPrefix) - 1) != 0)
+    if (flag_objc_abi == -1 || flag_objc_abi == 0 ||
+        (strncmp(Name, LPrefix, sizeof(LPrefix) - 1) != 0 &&
+         strncmp(Name, lPrefix, sizeof(lPrefix) - 1) != 0))
       TheDebugInfo->EmitGlobalVariable(GV, decl);
   }