[cfe-commits] r56824 - in /cfe/trunk/lib: Basic/Targets.cpp Lex/Preprocessor.cpp

[Chris Lattner]

Author: lattner
Date: Mon Sep 29 19:48:48 2008
New Revision: 56824

URL: http://llvm.org/viewvc/llvm-project?rev=56824&view=rev
Log:
define __PASCAL_STRINGS__ whenever -fpascal-strings is enabled.

Modified:
    cfe/trunk/lib/Basic/Targets.cpp
    cfe/trunk/lib/Lex/Preprocessor.cpp

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

==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Mon Sep 29 19:48:48 2008
@@ -42,10 +42,7 @@
 static void getDarwinDefines(std::vector<char> &Defs) {
   Define(Defs, "__APPLE__");
   Define(Defs, "__MACH__");
-  Define(Defs, "__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1050");
-  
-  if (0)  // darwin_pascal_strings
-    Define(Defs, "__PASCAL_STRINGS__");
+  Define(Defs, "__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", "1050");
 }
 
 static void getDragonFlyDefines(std::vector<char> &Defs) {

Modified: cfe/trunk/lib/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Preprocessor.cpp?rev=56824&r1=56823&r2=56824&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/Preprocessor.cpp (original)
+++ cfe/trunk/lib/Lex/Preprocessor.cpp Mon Sep 29 19:48:48 2008
@@ -414,6 +414,10 @@
   if (PP.getLangOptions().ObjC2)
     DefineBuiltinMacro(Buf, "OBJC_NEW_PROPERTIES");
 
+  if (PP.getLangOptions().PascalStrings)
+    DefineBuiltinMacro(Buf, "__PASCAL_STRINGS__");
+
+  
   // Add __builtin_va_list typedef.
   {
     const char *VAList = PP.getTargetInfo().getVAListDeclaration();