[llvm-branch-commits] [llvm-gcc-branch] r100567 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/c-parser.c

[Bob Wilson]

Author: bwilson
Date: Tue Apr  6 17:00:28 2010
New Revision: 100567

URL: http://llvm.org/viewvc/llvm-project?rev=100567&view=rev
Log:
--- Merging r100565 into '.':
U    gcc/c-parser.c

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-parser.c

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  6 17:00:28 2010
@@ -1 +1,2 @@
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303
+/llvm/trunk:100565
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-parser.c?rev=100567&r1=100566&r2=100567&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-parser.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-parser.c Tue Apr  6 17:00:28 2010
@@ -5643,8 +5643,17 @@
 	  c_parser_compound_statement_nostart (parser);
 	  c_parser_skip_until_found (parser, CPP_CLOSE_PAREN,
 				     "expected %<)%>");
+/* LLVM LOCAL begin */
+          /* Disable this warning for the sake of ARM NEON intrinsics, which
+             are implemented as macros with statement expressions in llvm-gcc
+             since the inliner is not run later and the arguments need to be
+             visible to the front-end.  Otherwise, it is not possible to
+             compile NEON intrinsics with "-pedantic -Werror".  */
+#ifndef ENABLE_LLVM
 	  if (pedantic)
 	    pedwarn ("ISO C forbids braced-groups within expressions");
+#endif
+/* LLVM LOCAL end */
 	  expr.value = c_finish_stmt_expr (stmt);
 	  expr.original_code = ERROR_MARK;
 	}