diff options
| -rw-r--r-- | include/clang/Basic/Version.h | 4 | ||||
| -rw-r--r-- | include/clang/Driver/Options.td | 1 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 5 |
3 files changed, 1 insertions, 9 deletions
diff --git a/include/clang/Basic/Version.h b/include/clang/Basic/Version.h index 05eff65072..ede68ed50d 100644 --- 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 1e48819a06..eeec267911 100644 --- 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 d29a0997ef..e8cfd711a3 100644 --- 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; } |