From c5358a5d4619e8a49b44295c70868f2f26a98462 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Thu, 11 Jul 2002 01:20:23 +0000 Subject: [PATCH] builtins.def: Make the argument types of abort and exit independent of the front-end. 2002-07-10 Roger Sayle Zack Weinberg * 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 From-SVN: r55385 --- gcc/ChangeLog | 6 ++++++ gcc/builtins.def | 8 ++++---- gcc/java/ChangeLog | 8 +++++++- gcc/java/builtins.c | 2 -- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.c-torture/execute/20000217-1.c | 2 +- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 815a424bcf2..6865e0668dd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2002-07-10 Roger Sayle + Zack Weinberg + + * builtins.def: Make the argument types of abort and exit + independent of the front-end. + 2002-07-11 Alan Modra * config/rs6000/linux64.h (ASM_SPEC): Define. diff --git a/gcc/builtins.def b/gcc/builtins.def index 5c2dbb20ebf..58f7c4915f6 100644 --- 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 3863b14b0df..0bbdcb966d0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,10 +1,16 @@ +2002-07-10 Roger Sayle + Zack Weinberg + + * builtins.c (initialize_builtins): Remove defines that + handled C/C++ specific junk hereby removed from builtins.def. + 2002-07-07 Neil Booth * lang.c (java_post_options): Update prototype. 2002-07-05 Roger Sayle - * 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 dafad79b434..eba84161363 100644 --- 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 d646c1cc931..f2800854a96 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-07-10 Roger Sayle + + * gcc.c-torture/execute/20000217-1.c: Fix usage of "abort". + 2002-07-10 Jeffrey A Law * 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 6763da7dcba..42716afbe0b 100644 --- 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); } -- 2.30.2