From: David Givone <david@givone.net>
Date: Mon, 7 Jan 2013 06:20:24 +0000 (-0800)
Subject: Change -x language option to use new objective c standard for gcc and clang
X-Git-Tag: v3.2~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f3e06cf26f41d69e3741234e340ceb23fa3ce9a;p=thirdparty%2Fccache.git

Change -x language option to use new objective c standard for gcc and clang

When preprocessing objective-c[++] files, use -x objective-c-cpp-output or
-x objective-c++-cpp-output which is supported by gcc 4.0+ and clang.
Previously, -x objc-cpp-output or -x objc++-cpp-output was used, but not
supported by clang.
---

diff --git a/language.c b/language.c
index acbeb89c3..3700476f8 100644
--- a/language.c
+++ b/language.c
@@ -44,8 +44,8 @@ static const struct {
 	/* Preprocessed: */
 	{".i",   "cpp-output"},
 	{".ii",  "c++-cpp-output"},
-	{".mi",  "objc-cpp-output"},
-	{".mii", "objc++-cpp-output"},
+	{".mi",  "objective-c-cpp-output"},
+	{".mii", "objective-c++-cpp-output"},
 	/* Header file (for precompilation): */
 	{".h",   "c-header"},
 	{".H",   "c++-header"},
@@ -70,18 +70,20 @@ static const struct {
 	const char *language;
 	const char *p_language;
 } languages[] = {
-	{"c",                    "cpp-output"},
-	{"cpp-output",           "cpp-output"},
-	{"c-header",             "cpp-output"},
-	{"c++",                  "c++-cpp-output"},
-	{"c++-cpp-output",       "c++-cpp-output"},
-	{"c++-header",           "c++-cpp-output"},
-	{"objective-c",          "objc-cpp-output"},
-	{"objective-c-header",   "objc-cpp-output"},
-	{"objc-cpp-output",      "objc-cpp-output"},
-	{"objective-c++",        "objc++-cpp-output"},
-	{"objc++-cpp-output",    "objc++-cpp-output"},
-	{"objective-c++-header", "objc++-cpp-output"},
+	{"c",                        "cpp-output"},
+	{"cpp-output",               "cpp-output"},
+	{"c-header",                 "cpp-output"},
+	{"c++",                      "c++-cpp-output"},
+	{"c++-cpp-output",           "c++-cpp-output"},
+	{"c++-header",               "c++-cpp-output"},
+	{"objective-c",              "objective-c-cpp-output"},
+	{"objective-c-header",       "objective-c-cpp-output"},
+	{"objc-cpp-output",          "objective-c-cpp-output"},
+	{"objective-c-cpp-output",   "objective-c-cpp-output"},
+	{"objective-c++",            "objective-c++-cpp-output"},
+	{"objc++-cpp-output",        "objective-c++-cpp-output"},
+	{"objective-c++-header",     "objective-c++-cpp-output"},
+	{"objective-c++-cpp-output", "objective-c++-cpp-output"},
 	{NULL,  NULL}};
 
 /*