On Tue, Sep 11, 2012 at 2:58 AM, David Chisnall <span dir="ltr"><<a href="mailto:csdavec@swan.ac.uk" target="_blank">csdavec@swan.ac.uk</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: theraven<br>
Date: Tue Sep 11 04:58:54 2012<br>
New Revision: 163605<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=163605&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=163605&view=rev</a><br>
Log:<br>
Select the correct, or, failing that, compatible, dialect when invoked as cc,<br>
c89, c99, and so on. No change to the default dialect when invoked as clang /<br>
clang++.<br>
<br>
<br>
Modified:<br>
cfe/trunk/tools/driver/driver.cpp<br>
<br>
Modified: cfe/trunk/tools/driver/driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=163605&r1=163604&r2=163605&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=163605&r1=163604&r2=163605&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/driver/driver.cpp (original)<br>
+++ cfe/trunk/tools/driver/driver.cpp Tue Sep 11 04:58:54 2012<br>
@@ -277,21 +277,32 @@<br>
// "x86_64-linux-clang" as interpreted as suffix "clang" with<br>
// target prefix "x86_64-linux". If such a target prefix is found,<br>
// is gets added via -target as implicit first argument.<br>
+ //<br>
+ // The default language dialect depends on the name by which clang was<br>
+ // invoked. These names first follow the standard and then the GCC<br>
+ // implementation. When invoked as c89 or c99, clang should be a c89 or c99<br>
+ // compiler, respectively, per POSIX. The compiler called cc was deprecated<br>
+ // by POSIX in 1997 and the language dialect is implementation defined.<br>
+ // Unfortunately, a lot of existing code depends on it being a C89 compiler.<br>
static const struct {<br>
const char *Suffix;<br>
bool IsCXX;<br>
bool IsCPP;<br>
+ const char *DefaultDialect;<br>
} suffixes [] = {<br>
- { "clang", false, false },<br>
- { "clang++", true, false },<br>
- { "clang-c++", true, false },<br>
- { "clang-cc", false, false },<br>
- { "clang-cpp", false, true },<br>
- { "clang-g++", true, false },<br>
- { "clang-gcc", false, false },<br>
- { "cc", false, false },<br>
- { "cpp", false, true },<br>
- { "++", true, false },<br>
+ { "clang", false, false, 0 },<br>
+ { "clang++", true, false, 0 },<br>
+ { "clang-c++", true, false, 0 },<br>
+ { "clang-cc", false, false, "-std=c89" },<br>
+ { "clang-cpp", false, true, 0 },<br>
+ { "clang-g++", true, false, "-std=gnu++89" },<br>
+ { "clang-gcc", false, false, "-std=gnu89" },<br>
+ { "cc", false, false, "-std=c89" },<br>
+ { "c89", false, false, "-std=c89" },<br>
+ { "c99", false, false, "-std=c99" },<br>
+ { "c11", false, false, "-std=c11" },<br>
+ { "cpp", false, true, 0 },<br>
+ { "++", true, false, 0 },<br>
};<br>
std::string ProgName(llvm::sys::path::stem(ArgVector[0]));<br>
StringRef ProgNameRef(ProgName);<br>
@@ -304,10 +315,14 @@<br>
for (i = 0; i < sizeof(suffixes) / sizeof(suffixes[0]); ++i) {<br>
if (ProgNameRef.endswith(suffixes[i].Suffix)) {<br>
FoundMatch = true;<br>
- if (suffixes[i].IsCXX)<br>
+ if (suffixes[i].IsCXX) {<br>
TheDriver.CCCIsCXX = true;<br>
+ fprintf(stderr, "ccc is c++\n");<br></blockquote><div><br></div><div>I assume you didn't mean to submit this line?</div></div>