[llvm-branch-commits] [cfe-branch] r195548 - Merging r195547:

[Bill Wendling]

Author: void
Date: Sat Nov 23 05:05:49 2013
New Revision: 195548

URL: http://llvm.org/viewvc/llvm-project?rev=195548&view=rev
Log:
Merging r195547:
------------------------------------------------------------------------
r195547 | d0k | 2013-11-23 02:57:32 -0800 (Sat, 23 Nov 2013) | 9 lines

Enable non-fragile ABI for the ObjFW runtime

The following patch enables the non-fragile ABI for the ObjFW runtime.

However, I noticed that it is not possible anymore to disable it with
-fno-objc-nonfragile-abi like it was before. I think this functionality should
be restored, but I guess this is not in scope for 3.4 anymore.

Patch by Jonathan Schleifer!
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/include/clang/Basic/ObjCRuntime.h

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 23 05:05:49 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195367,195384
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195367,195384,195547
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/include/clang/Basic/ObjCRuntime.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/include/clang/Basic/ObjCRuntime.h?rev=195548&r1=195547&r2=195548&view=diff
==============================================================================
--- cfe/branches/release_34/include/clang/Basic/ObjCRuntime.h (original)
+++ cfe/branches/release_34/include/clang/Basic/ObjCRuntime.h Sat Nov 23 05:05:49 2013
@@ -79,7 +79,7 @@ public:
     case GCC: return false;
     case MacOSX: return true;
     case GNUstep: return true;
-    case ObjFW: return false;
+    case ObjFW: return true;
     case iOS: return true;
     }
     llvm_unreachable("bad kind");