[cfe-commits] r122096 - in /cfe/trunk: include/clang/Basic/Version.h include/clang/Driver/Options.td lib/Driver/Driver.cpp

[Eric Christopher]

Author: echristo
Date: Fri Dec 17 16:46:41 2010
New Revision: 122096

URL: http://llvm.org/viewvc/llvm-project?rev=122096&view=rev
Log:
Going back to the drawing board with these two awful hacks.

Modified:
    cfe/trunk/include/clang/Basic/Version.h
    cfe/trunk/include/clang/Driver/Options.td
    cfe/trunk/lib/Driver/Driver.cpp

Modified: cfe/trunk/include/clang/Basic/Version.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Version.h?rev=122096&r1=122095&r2=122096&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Version.h (original)
+++ cfe/trunk/include/clang/Basic/Version.h Fri Dec 17 16:46:41 2010
@@ -40,10 +40,6 @@
   CLANG_MAKE_VERSION_STRING(CLANG_VERSION_MAJOR,CLANG_VERSION_MINOR)
 #endif
 
-/// \brief A horrible hack to work around projects that depend upon gcc
-/// compatible compilers having versions that resemble gcc.
-#define GCC_COMPAT_VERSION_STRING CLANG_MAKE_VERSION_STRING(4,2)
-
 namespace clang {
   /// \brief Retrieves the repository path (e.g., Subversion path) that 
   /// identifies the particular Clang branch, tag, or trunk from which this

Modified: cfe/trunk/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=122096&r1=122095&r2=122096&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Fri Dec 17 16:46:41 2010
@@ -196,7 +196,6 @@
 def ansi : Flag<"-ansi">, Group<a_Group>;
 def arch__errors__fatal : Flag<"-arch_errors_fatal">;
 def arch : Separate<"-arch">, Flags<[DriverOption]>;
-def arch__only : Separate<"-arch_only">, Flags<[NoForward]>;
 def a : Joined<"-a">, Group<a_Group>;
 def bind__at__load : Flag<"-bind_at_load">;
 def bundle__loader : Separate<"-bundle_loader">;

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=122096&r1=122095&r2=122096&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Fri Dec 17 16:46:41 2010
@@ -418,11 +418,8 @@
     return false;
   }
 
-  // This is a horrible hack. Some projects depend on gcc-like versions
-  // coming out of gcc -dumpversion to determine if the gcc compatible
-  // compiler has a correct version. Ideally we'd fix all of those projects.
   if (C.getArgs().hasArg(options::OPT_dumpversion)) {
-    llvm::outs() << GCC_COMPAT_VERSION_STRING "\n";
+    llvm::outs() << CLANG_VERSION_STRING "\n";
     return false;
   }