builtins.def: Make the argument types of abort and exit independent of the front...

2002-07-10  Roger Sayle  <roger@eyesopen.com>
	    Zack Weinberg <zack@codesourcery.com>

	* builtins.def: Make the argument types of abort and exit
	independent of the front-end.

	* java/builtins.c (initialize_builtins): Remove defines that
	handled C/C++ specific junk hereby removed from builtins.def.

	* gcc.c-torture/execute/20000217-1.c: Fix usage of "abort".

Co-Authored-By: Zack Weinberg <zack@codesourcery.com>
From-SVN: r55385

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 815a424bcf2138e75fa1c62a88a471fe08e1376a..6865e0668dd8d8d6689038f09350c7ccf24f7958 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-10  Roger Sayle  <roger@eyesopen.com>
+           Zack Weinberg <zack@codesourcery.com>
+
+       * builtins.def: Make the argument types of abort and exit
+       independent of the front-end.
+
 2002-07-11  Alan Modra  <amodra@bigpond.net.au>
 
        * config/rs6000/linux64.h (ASM_SPEC): Define.

diff --git a/gcc/builtins.def b/gcc/builtins.def
index 5c2dbb20ebf42b92c16a79d0e76a21055fd56840..58f7c4915f66e4ff59819c4f84cff4289268d736 100644 (file)
--- a/gcc/builtins.def
+++ b/gcc/builtins.def
@@ -549,16 +549,16 @@ DEF_UNUSED_BUILTIN(BUILT_IN_VEC_DELETE)
 DEF_BUILTIN (BUILT_IN_ABORT,
             "__builtin_abort",
             NOT_BUILT_IN,
-            (c_language == clk_cplusplus ? BT_FN_VOID : BT_FN_VOID_VAR),
-            (c_language == clk_cplusplus ? BT_FN_VOID : BT_FN_VOID_VAR),
+            BT_FN_VOID,
+            BT_FN_VOID,
             1, 0, 0,
             ATTR_NORETURN_NOTHROW_LIST)
 
 DEF_BUILTIN (BUILT_IN_EXIT,
             "__builtin_exit",
             NOT_BUILT_IN,
-            (c_language == clk_cplusplus ? BT_FN_VOID_INT : BT_FN_VOID_VAR),
-            (c_language == clk_cplusplus ? BT_FN_VOID_INT : BT_FN_VOID_VAR),
+            BT_FN_VOID_INT,
+            BT_FN_VOID_INT,
             1, 0, 0,
             ATTR_NORETURN_NOTHROW_LIST)
 

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3863b14b0df0a66c7f89b83184dee31d31d5c1f6..0bbdcb966d099e4aa1ff67ca66e879dadca03578 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,10 +1,16 @@
+2002-07-10  Roger Sayle  <roger@eyesopen.com>
+           Zack Weinberg <zack@codesourcery.com>
+
+       * builtins.c (initialize_builtins): Remove defines that
+       handled C/C++ specific junk hereby removed from builtins.def.
+
 2002-07-07  Neil Booth  <neil@daikokuya.co.uk>
 
        * lang.c (java_post_options): Update prototype.
 
 2002-07-05  Roger Sayle  <roger@eyesopen.com>
 
-       * java/builtins.c (initialize_builtins): Ignore the additional
+       * builtins.c (initialize_builtins): Ignore the additional
        parameter to DEF_BUILTIN.  Handle more C/C++ specific junk in
        the builtins.def file.
 

diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index dafad79b434669773696f478426ab6184a087892..eba84161363f94893f47e6fbb2d031c9df6a60e8 100644 (file)
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -284,8 +284,6 @@ initialize_builtins ()
 #define va_list_ref_type_node NULL_TREE
 #define va_list_arg_type_node NULL_TREE
 #define flag_isoc99 0
-#define c_language 0
-#define clk_cplusplus 0
 
 #define DEF_PRIMITIVE_TYPE(ENUM, VALUE)                                              \
   builtin_types[(int) ENUM] = VALUE;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d646c1cc9310f4359ce2dc419001eef42a0f12d8..f2800854a96c7195efe1c32b26016193199a5907 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-10  Roger Sayle  <roger@eyesopen.com>
+
+       * gcc.c-torture/execute/20000217-1.c: Fix usage of "abort".
+
 2002-07-10  Jeffrey A Law  <law@redhat.com>
 
         * gcc.c-torture/compile/981006-1.x: Do not use -fpic for mn102.

diff --git a/gcc/testsuite/gcc.c-torture/execute/20000217-1.c b/gcc/testsuite/gcc.c-torture/execute/20000217-1.c
index 6763da7dcbaf2e508b81aa5107d29f47064ee4b5..42716afbe0b1901b75745560f5b7c15221c1ded4 100644 (file)
--- a/gcc/testsuite/gcc.c-torture/execute/20000217-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/20000217-1.c
@@ -10,7 +10,7 @@ int main()
         unsigned short int y = 10;
 
         if (showbug(&x, &y) != 0)
-         abort (0);
+         abort ();
 
        exit (0);
 }