C++ PATCH for c++/49813 (c99 builtins in c++0x mode)

commit fc181abfe4b268602287b2cd036035ab40685b9b
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Jul 22 10:43:00 2011 -0400

    	PR c++/49813
    	* c-opts.c (set_std_cxx0x): Set flag_isoc94 and flag_isoc99.
    	* c-pretty-print.c (pp_c_cv_qualifiers): Check c_dialect_cxx as well
    	as flag_isoc99 for 'restrict'.
    	(pp_c_specifier_qualifier_list): Likewise for _Complex.

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index 5cf58ac..3227f7b 100644
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -1488,6 +1488,9 @@  set_std_cxx0x (int iso)
   flag_no_gnu_keywords = iso;
   flag_no_nonansi_builtin = iso;
   flag_iso = iso;
+  /* C++0x includes the C99 standard library.  */
+  flag_isoc94 = 1;
+  flag_isoc99 = 1;
   cxx_dialect = cxx0x;
 }
 
diff --git a/gcc/c-family/c-pretty-print.c b/gcc/c-family/c-pretty-print.c
index 977f79e..53d39d6 100644
--- a/gcc/c-family/c-pretty-print.c
+++ b/gcc/c-family/c-pretty-print.c
@@ -205,7 +205,8 @@  pp_c_cv_qualifiers (c_pretty_printer *pp, int qualifiers, bool func_type)
     {
       if (previous)
         pp_c_whitespace (pp);
-      pp_c_ws_string (pp, flag_isoc99 ? "restrict" : "__restrict__");
+      pp_c_ws_string (pp, (flag_isoc99 && !c_dialect_cxx ()
+			   ? "restrict" : "__restrict__"));
     }
 }
 
@@ -476,7 +477,8 @@  pp_c_specifier_qualifier_list (c_pretty_printer *pp, tree t)
     case VECTOR_TYPE:
     case COMPLEX_TYPE:
       if (code == COMPLEX_TYPE)
-	pp_c_ws_string (pp, flag_isoc99 ? "_Complex" : "__complex__");
+	pp_c_ws_string (pp, (flag_isoc99 && !c_dialect_cxx ()
+			     ? "_Complex" : "__complex__"));
       else if (code == VECTOR_TYPE)
 	{
 	  pp_c_ws_string (pp, "__vector");
diff --git a/gcc/testsuite/g++.dg/opt/builtins2.C b/gcc/testsuite/g++.dg/opt/builtins2.C
new file mode 100644
index 0000000..00a28db
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/builtins2.C
@@ -0,0 +1,11 @@ 
+// PR c++/49813
+// We should handle asinh as a built-in in C++0x mode, even when strict.
+// { dg-options "-std=c++0x" }
+// { dg-final { scan-assembler-not "asinh" } }
+
+#include <math.h>
+
+int main()
+{
+  double das = asinh(1.0);
+}
diff --git a/gcc/testsuite/g++.dg/other/error27.C b/gcc/testsuite/g++.dg/other/error27.C
index de97428..ef1e590 100644
--- a/gcc/testsuite/g++.dg/other/error27.C
+++ b/gcc/testsuite/g++.dg/other/error27.C
@@ -4,10 +4,10 @@ 
 
 void foo (double x, double y)
 {
-  __builtin_isgreater(x, y)();		// { dg-error "__builtin_\[^\n\]*cannot be used as a function" }
-  __builtin_isless(x, y)();		// { dg-error "__builtin_\[^\n\]*cannot be used as a function" }
-  __builtin_isgreaterequal(x, y)();	// { dg-error "__builtin_\[^\n\]*cannot be used as a function" }
-  __builtin_islessequal(x, y)();	// { dg-error "__builtin_\[^\n\]*cannot be used as a function" }
-  __builtin_isunordered(x, y)();	// { dg-error "__builtin_\[^\n\]*cannot be used as a function" }
-  __builtin_islessgreater(x, y)();	// { dg-error "__builtin_\[^\n\]*cannot be used as a function" }
+  __builtin_isgreater(x, y)();		// { dg-error "cannot be used as a function" }
+  __builtin_isless(x, y)();		// { dg-error "cannot be used as a function" }
+  __builtin_isgreaterequal(x, y)();	// { dg-error "cannot be used as a function" }
+  __builtin_islessequal(x, y)();	// { dg-error "cannot be used as a function" }
+  __builtin_isunordered(x, y)();	// { dg-error "cannot be used as a function" }
+  __builtin_islessgreater(x, y)();	// { dg-error "cannot be used as a function" }
 }