[cfe-commits] r72900 - in /cfe/trunk/lib: Basic/Targets.cpp Frontend/InitPreprocessor.cpp

[Eli Friedman]

Author: efriedma
Date: Thu Jun  4 18:00:29 2009
New Revision: 72900

URL: http://llvm.org/viewvc/llvm-project?rev=72900&view=rev
Log:
Move a couple Darwin-specific defines into getDarwinDefines.


Modified:
    cfe/trunk/lib/Basic/Targets.cpp
    cfe/trunk/lib/Frontend/InitPreprocessor.cpp

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=72900&r1=72899&r2=72900&view=diff

==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Thu Jun  4 18:00:29 2009
@@ -182,6 +182,11 @@
     Define(Defs, "__strong", "");
   else
     Define(Defs, "__strong", "__attribute__((objc_gc(strong)))");
+
+  if (Opts.Static)
+    Define(Defs, "__STATIC__");
+  else
+    Define(Defs, "__DYNAMIC__");
 }
 
 static void getDarwinOSXDefines(std::vector<char> &Defs, const char *Triple) {

Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=72900&r1=72899&r2=72900&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original)
+++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Thu Jun  4 18:00:29 2009
@@ -403,11 +403,6 @@
   // command line options or something.
   DefineBuiltinMacro(Buf, "__FINITE_MATH_ONLY__=0");
 
-  if (LangOpts.Static)
-    DefineBuiltinMacro(Buf, "__STATIC__=1");
-  else
-    DefineBuiltinMacro(Buf, "__DYNAMIC__=1");
-
   if (LangOpts.GNUInline)
     DefineBuiltinMacro(Buf, "__GNUC_GNU_INLINE__=1");
   else