diff options
| -rw-r--r-- | lib/Basic/Targets.cpp | 9 | ||||
| -rw-r--r-- | lib/Frontend/InitPreprocessor.cpp | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 541a1ed595..40840275da 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -84,14 +84,7 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts, Builder.defineMacro("__MACH__"); Builder.defineMacro("OBJC_NEW_PROPERTIES"); - if (Opts.ObjCAutoRefCount) { - Builder.defineMacro("__weak", "__attribute__((objc_lifetime(weak)))"); - Builder.defineMacro("__strong", "__attribute__((objc_lifetime(strong)))"); - Builder.defineMacro("__autoreleasing", - "__attribute__((objc_lifetime(autoreleasing)))"); - Builder.defineMacro("__unsafe_unretained", - "__attribute__((objc_lifetime(none)))"); - } else { + if (!Opts.ObjCAutoRefCount) { // __weak is always defined, for use in blocks and with objc pointers. Builder.defineMacro("__weak", "__attribute__((objc_gc(weak)))"); diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp index f1e1d47713..e1c394ea75 100644 --- a/lib/Frontend/InitPreprocessor.cpp +++ b/lib/Frontend/InitPreprocessor.cpp @@ -606,6 +606,15 @@ static void InitializePredefinedMacros(const TargetInfo &TI, if (LangOpts.FastRelaxedMath) Builder.defineMacro("__FAST_RELAXED_MATH__"); + if (LangOpts.ObjCAutoRefCount) { + Builder.defineMacro("__weak", "__attribute__((objc_lifetime(weak)))"); + Builder.defineMacro("__strong", "__attribute__((objc_lifetime(strong)))"); + Builder.defineMacro("__autoreleasing", + "__attribute__((objc_lifetime(autoreleasing)))"); + Builder.defineMacro("__unsafe_unretained", + "__attribute__((objc_lifetime(none)))"); + } + // Get other target #defines. TI.getTargetDefines(LangOpts, Builder); } |