Going back to the drawing board with these two awful hacks.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122096 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/Version.h b/include/clang/Basic/Version.h
index 05eff650723eaee74596d17c3aa1655feaaf59a5..ede68ed50d526f8d24decbcab28182a0c180671c 100644 (file)
--- a/include/clang/Basic/Version.h
+++ b/include/clang/Basic/Version.h
@@ -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

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 1e48819a0678ff952ba2dce526fd383d522845db..eeec2679117654f448814ac7ffcad9cf16608d5a 100644 (file)
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -196,7 +196,6 @@ def allowable__client : Separate<"-allowable_client">;
 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">;

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index d29a0997ef1fb4ef37381abaecbba1395c8f5ce3..e8cfd711a3ba0719a5b9e090796a2691f46d4bb6 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -418,11 +418,8 @@ bool Driver::HandleImmediateArgs(const Compilation &C) {
     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;
   }