From 844663353d34c43e99d920042820a8a33f5ab1de Mon Sep 17 00:00:00 2001 From: Bjorn Pettersson Date: Tue, 22 May 2018 08:16:45 +0000 Subject: Revert r332955 "GNUstep Objective-C ABI version 2" Reverted due to buildbot failures. Seems like isnumber() is some Apple addition to cctype. llvm-svn: 332957 --- clang/lib/Frontend/InitPreprocessor.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'clang/lib/Frontend/InitPreprocessor.cpp') diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 5bdfa14..f2182c8 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -645,19 +645,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI, if (LangOpts.ObjCRuntime.isNeXTFamily()) Builder.defineMacro("__NEXT_RUNTIME__"); - if (LangOpts.ObjCRuntime.getKind() == ObjCRuntime::GNUstep) { - auto version = LangOpts.ObjCRuntime.getVersion(); - std::string versionString = "1"; - // Don't rely on the tuple argument, because we can be asked to target - // later ABIs than we actually support, so clamp these values to those - // currently supported - if (version >= VersionTuple(2, 0)) - Builder.defineMacro("__OBJC_GNUSTEP_RUNTIME_ABI__", "20"); - else - Builder.defineMacro("__OBJC_GNUSTEP_RUNTIME_ABI__", - "1" + Twine(std::min(8U, version.getMinor().getValueOr(0)))); - } - if (LangOpts.ObjCRuntime.getKind() == ObjCRuntime::ObjFW) { VersionTuple tuple = LangOpts.ObjCRuntime.getVersion(); -- cgit v1.1