summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-common.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d40c51e4caf..d26f0d54f30 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-29 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * c-common.c (c_common_nodes_and_builtins): Don't special case
+ cplus_mode when declaring builtin bzero/bcmp, always avoid
+ prototype arguments.
+
2000-03-29 Bruce Korb <bkorb@gnu.org>
* fixinc/mkfixinc.sh: Initially set the variable "fixincludes"
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;
}
OpenPOWER on IntegriCloud