[llvm-commits] [llvm-gcc-4.2] r64977 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp

[Bill Wendling]

Author: void
Date: Wed Feb 18 17:08:53 2009
New Revision: 64977

URL: http://llvm.org/viewvc/llvm-project?rev=64977&view=rev
Log:
--- Merging r64976 into '.':
U    gcc/llvm-debug.cpp

Fix Objective-C runtime version encoding. flag_objc_abi is initiailzed as -1;
where -1 is not yet set to any value.

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

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

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-debug.cpp Wed Feb 18 17:08:53 2009
@@ -869,11 +869,14 @@
 
    // flag_objc_abi represents Objective-C runtime version number. It is zero
    // for all other language.
+   unsigned ObjcRunTimeVer = 0;
+   if (flag_objc_abi != 0 && flag_objc_abi != -1)
+     ObjcRunTimeVer = flag_objc_abi;
    DICompileUnit NewCU = DebugFactory.CreateCompileUnit(LangTag, FileName, 
                                                         Directory, 
                                                         version_string, isMain,
                                                         optimize, Flags,
-                                                        flag_objc_abi);
+                                                        ObjcRunTimeVer);
   CU = NewCU.getGV();
   return NewCU;
 }