[cfe-commits] r135510 - /cfe/trunk/lib/Basic/Targets.cpp

[Chad Rosier]

Author: mcrosier
Date: Tue Jul 19 15:00:06 2011
New Revision: 135510

URL: http://llvm.org/viewvc/llvm-project?rev=135510&view=rev
Log:
Refactor r135502 to avoid an empty if else condition, per Eric's suggestion (good call!).

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

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=135510&r1=135509&r2=135510&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Tue Jul 19 15:00:06 2011
@@ -146,6 +146,14 @@
     }
   }
 
+  // If -ccc-host-triple arch-pc-win32-macho option specified, we're
+  // generating code for Win32 ABI. No need to emit 
+  // __ENVIRONMENT_XX_OS_VERSION_MIN_REQUIRED__.
+  if (PlatformName == "win32") {
+    PlatformMinVersion = VersionTuple(Maj, Min, Rev);
+    return;
+  }
+
   // Set the appropriate OS version define.
   if (PlatformName == "ios") {
     assert(Maj < 10 && Min < 100 && Rev < 100 && "Invalid version!");
@@ -157,10 +165,6 @@
     Str[4] = '0' + (Rev % 10);
     Str[5] = '\0';
     Builder.defineMacro("__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__", Str);
-  } else if (PlatformName == "win32") {
-    // Due to option -ccc-host-triple arch-pc-win32-macho.
-    // Don't emit __ENVIRONMENT_XX_OS_VERSION_MIN_REQUIRED__ as we're generating
-    // code for Win32 ABI.
   } else {
     // Note that the Driver allows versions which aren't representable in the
     // define (because we only get a single digit for the minor and micro