[Bug target/54404] [4.8 Regression] *cfstring* failures for (obj-c|g)++ on *-apple-darwin* after revision 186978

[dominiq at lps dot ens.fr]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54404

Dominique d'Humieres <dominiq at lps dot ens.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dodji at gcc dot gnu.org
            Summary|[4.8 Regression] *cfstring* |[4.8 Regression] *cfstring*
                   |failures for (obj-c|g)++ on |failures for (obj-c|g)++ on
                   |*-apple-darwin* after       |*-apple-darwin* after
                   |revision 186789             |revision 186978

--- Comment #3 from Dominique d'Humieres <dominiq at lps dot ens.fr> 2012-10-14 19:26:21 UTC ---
After having applied the patch for r189391, a bissection gives the range 186973
(old behavior) 186980 (new one). I think the change occurs after 186977 and the
patch is obvious (see objc.dg/foreach-7.m at r186976):

--- ../_clean/gcc/testsuite/g++.dg/other/darwin-cfstring1.C    2010-10-23
22:17:07.000000000 +0200
+++ gcc/testsuite/g++.dg/other/darwin-cfstring1.C    2012-10-14
21:02:58.000000000 +0200
@@ -4,7 +4,7 @@
 /* Developed by Ziemowit Laski <zlaski@apple.com>.  */

 /* { dg-do compile { target *-*-darwin* } } */
-/* { dg-options "-mconstant-cfstrings" } */
+/* { dg-options "-ftrack-macro-expansion=0 -mconstant-cfstrings" } */

 #include <CoreFoundation/CFString.h>

--- ../_clean/gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm   
2010-10-22 13:23:41.000000000 +0200
+++ gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm    2012-10-14
21:11:08.000000000 +0200
@@ -6,7 +6,7 @@
 /* So far, CFString is darwin-only.  */
 /* { dg-do compile { target *-*-darwin* } } */
 /* { dg-skip-if "NeXT only" { *-*-* } { "-fgnu-runtime" } { "" } } */
-/* { dg-options "-mconstant-cfstrings -Wnonportable-cfstrings" } */
+/* { dg-options "-ftrack-macro-expansion=0 -mconstant-cfstrings
-Wnonportable-cfstrings" } */

 #import <Foundation/NSString.h>
 #import <CoreFoundation/CFString.h>

Patch tested on x86_64-apple-darwin10 and powerpc-apple-darwin9.