MFC r292950:

Drop the clang patch which adds recognition of 'CC' suffixes as aliases
for --driver-mode=g++, since this was never upstreamed.  For backwards
compatibility, add a wrapper shell script.

2 files changed, 0 insertions, 27 deletions

diff --git a/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff b/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff
deleted file mode 100644
index c5bc281..0000000
--- a/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-This patch adds "CC" and "clang-CC" to the list of program name aliases which
-invoke the C++ compiler.
-
-Introduced here: http://svnweb.freebsd.org/changeset/base/257109
-
-Index: tools/clang/tools/driver/driver.cpp
-===================================================================
---- tools/clang/tools/driver/driver.cpp
-+++ tools/clang/tools/driver/driver.cpp
-@@ -215,6 +215,7 @@ static void ParseProgName(SmallVectorImpl<const ch
-   } suffixes [] = {
-     { "clang",     0 },
-     { "clang++",   "--driver-mode=g++" },
-+    { "clang-CC",  "--driver-mode=g++" },
-     { "clang-c++", "--driver-mode=g++" },
-     { "clang-cc",  0 },
-     { "clang-cpp", "--driver-mode=cpp" },
-@@ -221,6 +222,7 @@ static void ParseProgName(SmallVectorImpl<const ch
-     { "clang-g++", "--driver-mode=g++" },
-     { "clang-gcc", 0 },
-     { "clang-cl",  "--driver-mode=cl"  },
-+    { "CC",        "--driver-mode=g++" },
-     { "cc",        0 },
-     { "cpp",       "--driver-mode=cpp" },
-     { "cl" ,       "--driver-mode=cl"  },
diff --git a/contrib/llvm/tools/clang/tools/driver/driver.cpp b/contrib/llvm/tools/clang/tools/driver/driver.cpp
index 3ff200b..4bbed6e 100644
--- a/contrib/llvm/tools/clang/tools/driver/driver.cpp
+++ b/contrib/llvm/tools/clang/tools/driver/driver.cpp
@@ -215,14 +215,12 @@ static void ParseProgName(SmallVectorImpl<const char *> &ArgVector,
   } suffixes [] = {
     { "clang",     0 },
     { "clang++",   "--driver-mode=g++" },
-    { "clang-CC",  "--driver-mode=g++" },
     { "clang-c++", "--driver-mode=g++" },
     { "clang-cc",  0 },
     { "clang-cpp", "--driver-mode=cpp" },
     { "clang-g++", "--driver-mode=g++" },
     { "clang-gcc", 0 },
     { "clang-cl",  "--driver-mode=cl"  },
-    { "CC",        "--driver-mode=g++" },
     { "cc",        0 },
     { "cpp",       "--driver-mode=cpp" },
     { "cl" ,       "--driver-mode=cl"  },