maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

A few more cleanups for the GNU family of ObjC runtimes. 

llvm-svn: 159708
This commit is contained in:
David Chisnall 2012-07-04 10:37:03 +00:00
parent 5cbbf4ca57
commit 314896c9fc
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/include/clang/Basic/ObjCRuntime.h
View File

@ -116,11 +116,8 @@ public:
case MacOSX: return getVersion() >= VersionTuple(10, 7);
case iOS: return getVersion() >= VersionTuple(5);
// This is really a lie, because some implementations and versions
// of the runtime do not support ARC. Probably -fgnu-runtime
// should imply a "maximal" runtime or something?
case GCC: return true;
case GNUstep: return true;
case GCC: return false;
case GNUstep: return getVersion() >= VersionTuple(1, 6);
}
llvm_unreachable("bad kind");
}

5
clang/lib/Basic/ObjCRuntime.cpp
View File

@ -54,6 +54,7 @@ bool ObjCRuntime::tryParse(StringRef input) {
// Everything prior to that must be a valid string name.
Kind kind;
StringRef runtimeName = input.substr(0, dash);
Version = VersionTuple(0);
if (runtimeName == "macosx") {
kind = ObjCRuntime::MacOSX;
} else if (runtimeName == "macosx-fragile") {
@ -61,6 +62,9 @@ bool ObjCRuntime::tryParse(StringRef input) {
} else if (runtimeName == "ios") {
kind = ObjCRuntime::iOS;
} else if (runtimeName == "gnustep") {
// If no version is specified then default to the most recent one that we
// know about.
Version = VersionTuple(1, 6);
kind = ObjCRuntime::GNUstep;
} else if (runtimeName == "gcc") {
kind = ObjCRuntime::GCC;
@ -69,7 +73,6 @@ bool ObjCRuntime::tryParse(StringRef input) {
}
TheKind = kind;
Version = VersionTuple(0);
if (dash != StringRef::npos) {
StringRef verString = input.substr(dash + 1);
if (Version.tryParse(verString))

7
clang/lib/Driver/Tools.cpp
View File

@ -2934,7 +2934,12 @@ ObjCRuntime Clang::AddObjCRuntimeArgs(const ArgList &args,
// -fgnu-runtime
} else {
assert(runtimeArg->getOption().matches(options::OPT_fgnu_runtime));
runtime = ObjCRuntime(ObjCRuntime::GCC, VersionTuple());
// Legacy behaviour is to target the gnustep runtime if we are i
// non-fragile mode or the GCC runtime in fragile mode.
if (isNonFragile)
runtime = ObjCRuntime(ObjCRuntime::GNUstep, VersionTuple());
else
runtime = ObjCRuntime(ObjCRuntime::GCC, VersionTuple());
}
cmdArgs.push_back(args.MakeArgString(