* c-common.c (c_common_nodes_and_builtins): Don't special case

	cplus_mode when declaring builtin bzero/bcmp, always avoid
	prototype arguments.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32805 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 5 deletions

diff --git a/gcc/c-common.c b/gcc/c-common.c
index b80501d0898..0589c03a8d7 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -3645,13 +3645,13 @@ c_common_nodes_and_builtins (cplus_mode, no_builtins, no_nonansi_builtins)
       /* Suppress error if redefined as a non-function.  */
       DECL_BUILT_IN_NONANSI (temp) = 1;
 
-      /* In C mode, don't conflict with system prototype variations.  */
-      temp = builtin_function ("bzero",
-			       cplus_mode ? bzero_ftype : void_ftype_any,
+      /* The system prototypes for these functions have many
+	 variations, so don't specify parameters to avoid conflicts.
+	 The expand_* functions check the argument types anyway.  */
+      temp = builtin_function ("bzero", void_ftype_any,
 			       BUILT_IN_BZERO, BUILT_IN_NORMAL, NULL_PTR);
       DECL_BUILT_IN_NONANSI (temp) = 1;
-      temp = builtin_function ("bcmp",
-			       cplus_mode ? bcmp_ftype : int_ftype_any,
+      temp = builtin_function ("bcmp", int_ftype_any,
 			       BUILT_IN_BCMP, BUILT_IN_NORMAL, NULL_PTR);
       DECL_BUILT_IN_NONANSI (temp) = 1;
     }