This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
C++ bootstrap (part 2/n)
- From: Bernardo Innocenti <bernie at develer dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 25 Jul 2004 02:13:15 +0200
- Subject: C++ bootstrap (part 2/n)
- Organization: Develer S.r.l.
Hello,
This part is very mechanical. There are still many occurrences of
ATTRIBUTE_UNUSED. So far I've only fixed those that were interfering
with C bootstrap and a few more.
Bootstrapped on powerpc-apple-darwin and committed as pre-approved.
2004-07-25 Bernardo Innocenti <bernie@develer.com>
* c-common.c: Convert ATTRIBUTE_UNUSED to ARG_UNUSED in parameter
lists.
* c-decl.c: Likewise.
* c-format.c: Likewise.
* c-lex.c: Likewise.
* c-opts.c: Likewise.
* c-pragma.c: Likewise.
* c-typeck.c: Likewise.
* gencheck.c: Likewise.
* genconditions.c: Likewise.
* genconfig.c: Likewise.
* genflags.c: Likewise.
* gengtype.c: Likewise.
* gensupport.c: Likewise.
* ggc-none.c: Likewise.
* langhooks.c: Likewise.
* statistics.h: Likewise.
* stub-objc.c: Likewise.
* java/decl.c: Likewise.
Index: gcc/c-common.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-common.c,v
retrieving revision 1.535
diff -u -p -u -p -r1.535 c-common.c
--- gcc/c-common.c 22 Jul 2004 08:20:34 -0000 1.535
+++ gcc/c-common.c 24 Jul 2004 18:37:57 -0000
@@ -3923,7 +3923,7 @@ c_init_attributes (void)
struct attribute_spec.handler. */
static tree
-handle_packed_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
+handle_packed_attribute (tree *node, tree name, tree ARG_UNUSED (args),
int flags, bool *no_add_attrs)
{
if (TYPE_P (*node))
@@ -3967,8 +3967,8 @@ handle_packed_attribute (tree *node, tre
static tree
handle_nocommon_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == VAR_DECL)
DECL_COMMON (*node) = 0;
@@ -3985,8 +3985,8 @@ handle_nocommon_attribute (tree *node, t
struct attribute_spec.handler. */
static tree
-handle_common_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_common_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == VAR_DECL)
DECL_COMMON (*node) = 1;
@@ -4003,8 +4003,8 @@ handle_common_attribute (tree *node, tre
struct attribute_spec.handler. */
static tree
-handle_noreturn_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_noreturn_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree type = TREE_TYPE (*node);
@@ -4031,8 +4031,8 @@ handle_noreturn_attribute (tree *node, t
static tree
handle_noinline_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == FUNCTION_DECL)
DECL_UNINLINABLE (*node) = 1;
@@ -4050,8 +4050,8 @@ handle_noinline_attribute (tree *node, t
static tree
handle_always_inline_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED,
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
if (TREE_CODE (*node) == FUNCTION_DECL)
@@ -4072,8 +4072,8 @@ handle_always_inline_attribute (tree *no
struct attribute_spec.handler. */
static tree
-handle_used_attribute (tree *pnode, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_used_attribute (tree *pnode, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree node = *pnode;
@@ -4095,8 +4095,8 @@ handle_used_attribute (tree *pnode, tree
struct attribute_spec.handler. */
static tree
-handle_unused_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_unused_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int flags, bool *no_add_attrs)
{
if (DECL_P (*node))
{
@@ -4128,8 +4128,8 @@ handle_unused_attribute (tree *node, tre
struct attribute_spec.handler. */
static tree
-handle_const_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_const_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree type = TREE_TYPE (*node);
@@ -4156,7 +4156,7 @@ handle_const_attribute (tree *node, tree
static tree
handle_transparent_union_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED, int flags,
+ tree ARG_UNUSED (args), int flags,
bool *no_add_attrs)
{
tree decl = NULL_TREE;
@@ -4200,8 +4200,8 @@ handle_transparent_union_attribute (tree
static tree
handle_constructor_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED,
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
tree decl = *node;
@@ -4228,8 +4228,8 @@ handle_constructor_attribute (tree *node
static tree
handle_destructor_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED,
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
tree decl = *node;
@@ -4255,8 +4255,8 @@ handle_destructor_attribute (tree *node,
struct attribute_spec.handler. */
static tree
-handle_mode_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_mode_attribute (tree *node, tree name, tree args,
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree type = *node;
@@ -4352,8 +4352,8 @@ handle_mode_attribute (tree *node, tree
struct attribute_spec.handler. */
static tree
-handle_section_attribute (tree *node, tree name ATTRIBUTE_UNUSED, tree args,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_section_attribute (tree *node, tree ARG_UNUSED (name), tree args,
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree decl = *node;
@@ -4404,7 +4404,7 @@ handle_section_attribute (tree *node, tr
struct attribute_spec.handler. */
static tree
-handle_aligned_attribute (tree *node, tree name ATTRIBUTE_UNUSED, tree args,
+handle_aligned_attribute (tree *node, tree ARG_UNUSED (name), tree args,
int flags, bool *no_add_attrs)
{
tree decl = NULL_TREE;
@@ -4483,10 +4483,10 @@ handle_aligned_attribute (tree *node, tr
struct attribute_spec.handler. */
static tree
-handle_weak_attribute (tree *node, tree name ATTRIBUTE_UNUSED,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED,
- bool *no_add_attrs ATTRIBUTE_UNUSED)
+handle_weak_attribute (tree *node, tree ARG_UNUSED (name),
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags),
+ bool * ARG_UNUSED (no_add_attrs))
{
declare_weak (*node);
@@ -4498,7 +4498,7 @@ handle_weak_attribute (tree *node, tree
static tree
handle_alias_attribute (tree *node, tree name, tree args,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree decl = *node;
@@ -4551,7 +4551,7 @@ handle_alias_attribute (tree *node, tree
static tree
handle_visibility_attribute (tree *node, tree name, tree args,
- int flags ATTRIBUTE_UNUSED,
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
tree decl = *node;
@@ -4590,7 +4590,7 @@ handle_visibility_attribute (tree *node,
static tree
handle_tls_model_attribute (tree *node, tree name, tree args,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree decl = *node;
@@ -4629,8 +4629,8 @@ handle_tls_model_attribute (tree *node,
static tree
handle_no_instrument_function_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED,
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
tree decl = *node;
@@ -4655,8 +4655,8 @@ handle_no_instrument_function_attribute
struct attribute_spec.handler. */
static tree
-handle_malloc_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_malloc_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == FUNCTION_DECL)
DECL_IS_MALLOC (*node) = 1;
@@ -4675,8 +4675,8 @@ handle_malloc_attribute (tree *node, tre
static tree
handle_no_limit_stack_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED,
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
tree decl = *node;
@@ -4701,8 +4701,8 @@ handle_no_limit_stack_attribute (tree *n
struct attribute_spec.handler. */
static tree
-handle_pure_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_pure_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == FUNCTION_DECL)
DECL_IS_PURE (*node) = 1;
@@ -4721,7 +4721,7 @@ handle_pure_attribute (tree *node, tree
static tree
handle_deprecated_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED, int flags,
+ tree ARG_UNUSED (args), int flags,
bool *no_add_attrs)
{
tree type = NULL_TREE;
@@ -4779,7 +4779,7 @@ handle_deprecated_attribute (tree *node,
static tree
handle_vector_size_attribute (tree *node, tree name, tree args,
- int flags ATTRIBUTE_UNUSED,
+ int ARG_UNUSED (flags),
bool *no_add_attrs)
{
unsigned HOST_WIDE_INT vecsize, nunits;
@@ -4848,8 +4848,8 @@ handle_vector_size_attribute (tree *node
/* Handle the "nonnull" attribute. */
static tree
-handle_nonnull_attribute (tree *node, tree name ATTRIBUTE_UNUSED,
- tree args, int flags ATTRIBUTE_UNUSED,
+handle_nonnull_attribute (tree *node, tree ARG_UNUSED (name),
+ tree args, int ARG_UNUSED (flags),
bool *no_add_attrs)
{
tree type = *node;
@@ -4973,7 +4973,7 @@ nonnull_check_p (tree args, unsigned HOS
via check_function_arguments_recurse. */
static void
-check_nonnull_arg (void *ctx ATTRIBUTE_UNUSED, tree param,
+check_nonnull_arg (void * ARG_UNUSED (ctx), tree param,
unsigned HOST_WIDE_INT param_num)
{
/* Just skip checking the argument if it's not a pointer. This can
@@ -5013,8 +5013,8 @@ get_nonnull_operand (tree arg_num_expr,
struct attribute_spec.handler. */
static tree
-handle_nothrow_attribute (tree *node, tree name, tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+handle_nothrow_attribute (tree *node, tree name, tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == FUNCTION_DECL)
TREE_NOTHROW (*node) = 1;
@@ -5033,7 +5033,7 @@ handle_nothrow_attribute (tree *node, tr
static tree
handle_cleanup_attribute (tree *node, tree name, tree args,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
tree decl = *node;
tree cleanup_id, cleanup_decl;
@@ -5077,8 +5077,8 @@ handle_cleanup_attribute (tree *node, tr
static tree
handle_warn_unused_result_attribute (tree *node, tree name,
- tree args ATTRIBUTE_UNUSED,
- int flags ATTRIBUTE_UNUSED, bool *no_add_attrs)
+ tree ARG_UNUSED (args),
+ int ARG_UNUSED (flags), bool *no_add_attrs)
{
/* Ignore the attribute for functions not returning any value. */
if (VOID_TYPE_P (TREE_TYPE (*node)))
@@ -5245,11 +5245,11 @@ resort_field_decl_cmp (const void *x_p,
void
resort_sorted_fields (void *obj,
- void *orig_obj ATTRIBUTE_UNUSED ,
+ void * ARG_UNUSED (orig_obj),
gt_pointer_operator new_value,
void *cookie)
{
- struct sorted_fields_type *sf = obj;
+ struct sorted_fields_type *sf = (struct sorted_fields_type *) obj;
resort_data.new_value = new_value;
resort_data.cookie = cookie;
qsort (&sf->elts[0], sf->len, sizeof (tree),
Index: gcc/c-decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-decl.c,v
retrieving revision 1.536
diff -u -p -u -p -r1.536 c-decl.c
--- gcc/c-decl.c 23 Jul 2004 19:22:08 -0000 1.536
+++ gcc/c-decl.c 24 Jul 2004 18:38:04 -0000
@@ -6526,7 +6526,7 @@ current_stmt_tree (void)
C. */
int
-anon_aggr_type_p (tree node ATTRIBUTE_UNUSED)
+anon_aggr_type_p (tree ARG_UNUSED (node))
{
return 0;
}
Index: gcc/c-format.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-format.c,v
retrieving revision 1.60
diff -u -p -u -p -r1.60 c-format.c
--- gcc/c-format.c 19 Jul 2004 14:47:53 -0000 1.60
+++ gcc/c-format.c 24 Jul 2004 18:38:08 -0000
@@ -83,7 +83,7 @@ static bool get_constant (tree expr, uns
/* Handle a "format_arg" attribute; arguments as in
struct attribute_spec.handler. */
tree
-handle_format_arg_attribute (tree *node, tree name ATTRIBUTE_UNUSED,
+handle_format_arg_attribute (tree *node, tree ARG_UNUSED (name),
tree args, int flags, bool *no_add_attrs)
{
tree type = *node;
@@ -2457,7 +2457,7 @@ extern const format_kind_info TARGET_FOR
/* Handle a "format" attribute; arguments as in
struct attribute_spec.handler. */
tree
-handle_format_attribute (tree *node, tree name ATTRIBUTE_UNUSED, tree args,
+handle_format_attribute (tree *node, tree ARG_UNUSED (name), tree args,
int flags, bool *no_add_attrs)
{
tree type = *node;
Index: gcc/c-lex.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-lex.c,v
retrieving revision 1.224
diff -u -p -u -p -r1.224 c-lex.c
--- gcc/c-lex.c 20 Jul 2004 23:02:33 -0000 1.224
+++ gcc/c-lex.c 24 Jul 2004 18:38:08 -0000
@@ -147,7 +147,7 @@ update_header_times (const char *name)
}
static int
-dump_one_header (splay_tree_node n, void *dummy ATTRIBUTE_UNUSED)
+dump_one_header (splay_tree_node n, void * ARG_UNUSED (dummy))
{
print_time ((const char *) n->key,
((struct c_fileinfo *) n->value)->time);
@@ -172,9 +172,9 @@ dump_time_statistics (void)
}
static void
-cb_ident (cpp_reader *pfile ATTRIBUTE_UNUSED,
- unsigned int line ATTRIBUTE_UNUSED,
- const cpp_string *str ATTRIBUTE_UNUSED)
+cb_ident (cpp_reader * ARG_UNUSED (pfile),
+ unsigned int ARG_UNUSED (line),
+ const cpp_string * ARG_UNUSED (str))
{
#ifdef ASM_OUTPUT_IDENT
if (! flag_no_ident)
@@ -193,7 +193,7 @@ cb_ident (cpp_reader *pfile ATTRIBUTE_UN
/* Called at the start of every non-empty line. TOKEN is the first
lexed token on the line. Used for diagnostic line numbers. */
static void
-cb_line_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const cpp_token *token,
+cb_line_change (cpp_reader * ARG_UNUSED (pfile), const cpp_token *token,
int parsing_args)
{
if (token->type != CPP_EOF && !parsing_args)
@@ -315,7 +315,7 @@ cb_define (cpp_reader *pfile, source_loc
/* #undef callback for DWARF and DWARF2 debug info. */
static void
-cb_undef (cpp_reader *pfile ATTRIBUTE_UNUSED, source_location loc,
+cb_undef (cpp_reader * ARG_UNUSED (pfile), source_location loc,
cpp_hashnode *node)
{
const struct line_map *map = linemap_lookup (&line_table, loc);
Index: gcc/c-opts.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-opts.c,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 c-opts.c
--- gcc/c-opts.c 9 Jul 2004 21:30:33 -0000 1.120
+++ gcc/c-opts.c 24 Jul 2004 18:38:10 -0000
@@ -194,7 +194,7 @@ defer_opt (enum opt_code code, const cha
/* Common initialization before parsing options. */
unsigned int
-c_common_init_options (unsigned int argc, const char **argv ATTRIBUTE_UNUSED)
+c_common_init_options (unsigned int argc, const char ** ARG_UNUSED (argv))
{
static const unsigned int lang_flags[] = {CL_C, CL_ObjC, CL_CXX, CL_ObjCXX};
unsigned int result;
@@ -1354,7 +1354,7 @@ push_command_line_include (void)
/* File change callback. Has to handle -include files. */
static void
-cb_file_change (cpp_reader *pfile ATTRIBUTE_UNUSED,
+cb_file_change (cpp_reader * ARG_UNUSED (pfile),
const struct line_map *new_map)
{
if (flag_preprocess_only)
@@ -1367,7 +1367,7 @@ cb_file_change (cpp_reader *pfile ATTRIB
}
void
-cb_dir_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const char *dir)
+cb_dir_change (cpp_reader * ARG_UNUSED (pfile), const char *dir)
{
if (! set_src_pwd (dir))
warning ("too late for # directive to set debug directory");
Index: gcc/c-pragma.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-pragma.c,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 c-pragma.c
--- gcc/c-pragma.c 22 Jun 2004 06:51:50 -0000 1.71
+++ gcc/c-pragma.c 24 Jul 2004 18:38:10 -0000
@@ -155,7 +155,7 @@ pop_alignment (tree id)
#pragma pack (pop)
#pragma pack (pop, ID) */
static void
-handle_pragma_pack (cpp_reader *dummy ATTRIBUTE_UNUSED)
+handle_pragma_pack (cpp_reader * ARG_UNUSED (dummy))
{
tree x, id = 0;
int align = -1;
@@ -315,7 +315,7 @@ maybe_apply_pragma_weak (tree decl)
/* #pragma weak name [= value] */
static void
-handle_pragma_weak (cpp_reader *dummy ATTRIBUTE_UNUSED)
+handle_pragma_weak (cpp_reader * ARG_UNUSED (dummy))
{
tree name, value, x, decl;
enum cpp_ttype t;
@@ -346,7 +346,7 @@ handle_pragma_weak (cpp_reader *dummy AT
}
#else
void
-maybe_apply_pragma_weak (tree decl ATTRIBUTE_UNUSED)
+maybe_apply_pragma_weak (tree ARG_UNUSED (decl))
{
}
#endif /* HANDLE_PRAGMA_WEAK */
@@ -389,7 +389,7 @@ static void handle_pragma_redefine_extna
/* #pragma redefine_extname oldname newname */
static void
-handle_pragma_redefine_extname (cpp_reader *dummy ATTRIBUTE_UNUSED)
+handle_pragma_redefine_extname (cpp_reader * ARG_UNUSED (dummy))
{
tree oldname, newname, decl, x;
enum cpp_ttype t;
@@ -458,7 +458,7 @@ static GTY(()) tree pragma_extern_prefix
/* #pragma extern_prefix "prefix" */
static void
-handle_pragma_extern_prefix (cpp_reader *dummy ATTRIBUTE_UNUSED)
+handle_pragma_extern_prefix (cpp_reader * ARG_UNUSED (dummy))
{
tree prefix, x;
enum cpp_ttype t;
Index: gcc/c-typeck.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-typeck.c,v
retrieving revision 1.347
diff -u -p -u -p -r1.347 c-typeck.c
--- gcc/c-typeck.c 24 Jul 2004 07:32:13 -0000 1.347
+++ gcc/c-typeck.c 24 Jul 2004 18:38:20 -0000
@@ -6806,7 +6806,7 @@ c_end_compound_stmt (tree stmt, bool do_
meant to apply to normal control flow transfer. */
void
-push_cleanup (tree decl ATTRIBUTE_UNUSED, tree cleanup, bool eh_only)
+push_cleanup (tree ARG_UNUSED (decl), tree cleanup, bool eh_only)
{
enum tree_code code;
tree stmt, list;
Index: gcc/gencheck.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gencheck.c,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 gencheck.c
--- gcc/gencheck.c 16 Jun 2003 19:14:21 -0000 1.27
+++ gcc/gencheck.c 24 Jul 2004 18:38:20 -0000
@@ -42,7 +42,7 @@ usage (void)
}
int
-main (int argc, char **argv ATTRIBUTE_UNUSED)
+main (int argc, char ** ARG_UNUSED (argv))
{
int i, j;
Index: gcc/genconditions.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/genconditions.c,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 genconditions.c
--- gcc/genconditions.c 4 Jun 2004 16:10:20 -0000 1.10
+++ gcc/genconditions.c 24 Jul 2004 18:38:21 -0000
@@ -138,7 +138,7 @@ extern rtx operands[];\n");
MAYBE_EVAL (! optimize_size && ! TARGET_READ_MODIFY_WRITE) }, */
static int
-write_one_condition (void **slot, void *dummy ATTRIBUTE_UNUSED)
+write_one_condition (void **slot, void * ARG_UNUSED (dummy))
{
const struct c_test *test = * (const struct c_test **) slot;
const char *p;
Index: gcc/genconfig.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/genconfig.c,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 genconfig.c
--- gcc/genconfig.c 4 Feb 2004 19:15:16 -0000 1.52
+++ gcc/genconfig.c 24 Jul 2004 18:38:21 -0000
@@ -369,7 +369,7 @@ main (int argc, char **argv)
/* Define this so we can link with print-rtl.o to get debug_rtx function. */
const char *
-get_insn_name (int code ATTRIBUTE_UNUSED)
+get_insn_name (int ARG_UNUSED (code))
{
return NULL;
}
Index: gcc/genflags.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/genflags.c,v
retrieving revision 1.50
diff -u -p -u -p -r1.50 genflags.c
--- gcc/genflags.c 21 Jan 2004 20:40:00 -0000 1.50
+++ gcc/genflags.c 24 Jul 2004 18:38:22 -0000
@@ -179,8 +179,8 @@ gen_proto (rtx insn)
{
putchar ('(');
for (i = 0; i < num-1; i++)
- printf ("rtx %c ATTRIBUTE_UNUSED, ", 'a' + i);
- printf ("rtx %c ATTRIBUTE_UNUSED)\n", 'a' + i);
+ printf ("rtx ARG_UNUSED (%c), ", 'a' + i);
+ printf ("rtx ARG_UNUSED (%c))\n", 'a' + i);
}
else
puts ("(void)");
@@ -287,7 +287,7 @@ main (int argc, char **argv)
/* Define this so we can link with print-rtl.o to get debug_rtx function. */
const char *
-get_insn_name (int code ATTRIBUTE_UNUSED)
+get_insn_name (int ARG_UNUSED (code))
{
return NULL;
}
Index: gcc/gengtype.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gengtype.c,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 gengtype.c
--- gcc/gengtype.c 8 Jul 2004 07:45:43 -0000 1.56
+++ gcc/gengtype.c 24 Jul 2004 18:38:25 -0000
@@ -391,7 +391,7 @@ write_rtx_next (void)
are based in a complex way on the type of RTL. */
static type_p
-adjust_field_rtx_def (type_p t, options_p opt ATTRIBUTE_UNUSED)
+adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
{
pair_p flds = NULL;
options_p nodot;
@@ -2233,7 +2233,10 @@ write_local_func_for_structure (type_p o
oprintf (d.of, "void\n");
oprintf (d.of, "gt_pch_p_");
output_mangled_typename (d.of, orig_s);
- oprintf (d.of, " (void *this_obj ATTRIBUTE_UNUSED,\n\tvoid *x_p,\n\tgt_pointer_operator op ATTRIBUTE_UNUSED,\n\tvoid *cookie ATTRIBUTE_UNUSED)\n");
+ oprintf (d.of, " (ATTRIBUTE_UNUSED void *this_obj,\n"
+ "\tvoid *x_p,\n"
+ "\tATTRIBUTE_UNUSED gt_pointer_operator op,\n"
+ "\tATTRIBUTE_UNUSED void *cookie)\n");
oprintf (d.of, "{\n");
oprintf (d.of, " %s %s * const x ATTRIBUTE_UNUSED = (%s %s *)x_p;\n",
s->kind == TYPE_UNION ? "union" : "struct", s->u.s.tag,
@@ -2648,11 +2651,12 @@ write_array (outf_p f, pair_p v, const s
oprintf (f, "static void gt_%sa_%s\n", wtd->param_prefix, v->name);
oprintf (f,
" (void *, void *, gt_pointer_operator, void *);\n");
- oprintf (f, "static void gt_%sa_%s (void *this_obj ATTRIBUTE_UNUSED,\n",
+ oprintf (f, "static void gt_%sa_%s (ATTRIBUTE_UNUSED void *this_obj,\n",
wtd->param_prefix, v->name);
- oprintf (d.of, " void *x_p ATTRIBUTE_UNUSED,\n");
- oprintf (d.of, " gt_pointer_operator op ATTRIBUTE_UNUSED,\n");
- oprintf (d.of, " void *cookie ATTRIBUTE_UNUSED)\n");
+ oprintf (d.of,
+ " ATTRIBUTE_UNUSED void *x_p,\n"
+ " ATTRIBUTE_UNUSED gt_pointer_operator op,\n"
+ " ATTRIBUTE_UNUSED void * cookie)\n");
oprintf (d.of, "{\n");
d.prev_val[0] = d.prev_val[1] = d.prev_val[2] = d.val = v->name;
d.process_field = write_types_local_process_field;
@@ -2663,7 +2667,7 @@ write_array (outf_p f, pair_p v, const s
d.opt = v->opt;
oprintf (f, "static void gt_%sa_%s (void *);\n",
wtd->prefix, v->name);
- oprintf (f, "static void\ngt_%sa_%s (void *x_p ATTRIBUTE_UNUSED)\n",
+ oprintf (f, "static void\ngt_%sa_%s (ATTRIBUTE_UNUSED void *x_p)\n",
wtd->prefix, v->name);
oprintf (f, "{\n");
d.prev_val[0] = d.prev_val[1] = d.prev_val[2] = d.val = v->name;
@@ -2924,7 +2928,7 @@ write_roots (pair_p variables)
extern int main (int argc, char **argv);
int
-main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+main(int ARG_UNUSED (argc), char ** ARG_UNUSED (argv))
{
unsigned i;
static struct fileloc pos = { __FILE__, __LINE__ };
Index: gcc/gensupport.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gensupport.c,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 gensupport.c
--- gcc/gensupport.c 30 May 2004 18:32:26 -0000 1.49
+++ gcc/gensupport.c 24 Jul 2004 18:38:26 -0000
@@ -128,7 +128,7 @@ message_with_line (int lineno, const cha
the gensupport programs. */
rtx
-gen_rtx_CONST_INT (enum machine_mode mode ATTRIBUTE_UNUSED,
+gen_rtx_CONST_INT (enum machine_mode ARG_UNUSED (mode),
HOST_WIDE_INT arg)
{
rtx rt = rtx_alloc (CONST_INT);
Index: gcc/ggc-none.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ggc-none.c,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 ggc-none.c
--- gcc/ggc-none.c 15 Mar 2004 18:20:39 -0000 1.17
+++ gcc/ggc-none.c 24 Jul 2004 18:38:26 -0000
@@ -32,7 +32,7 @@ struct alloc_zone *rtl_zone = NULL;
struct alloc_zone *garbage_zone = NULL;
void *
-ggc_alloc_typed_stat (enum gt_types_enum gte ATTRIBUTE_UNUSED, size_t size
+ggc_alloc_typed_stat (enum gt_types_enum ARG_UNUSED (gte), size_t size
MEM_STAT_DECL)
{
return xmalloc (size);
@@ -45,7 +45,7 @@ ggc_alloc_stat (size_t size MEM_STAT_DEC
}
void *
-ggc_alloc_zone_stat (size_t size, struct alloc_zone *zone ATTRIBUTE_UNUSED
+ggc_alloc_zone_stat (size_t size, struct alloc_zone * ARG_UNUSED (zone)
MEM_STAT_DECL)
{
return xmalloc (size);
Index: gcc/langhooks.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/langhooks.c,v
retrieving revision 1.69
diff -u -p -u -p -r1.69 langhooks.c
--- gcc/langhooks.c 16 Jul 2004 20:51:25 -0000 1.69
+++ gcc/langhooks.c 24 Jul 2004 18:38:28 -0000
@@ -46,23 +46,23 @@ lhd_do_nothing (void)
/* Do nothing (tree). */
void
-lhd_do_nothing_t (tree t ATTRIBUTE_UNUSED)
+lhd_do_nothing_t (tree ARG_UNUSED (t))
{
}
/* Do nothing (int). */
void
-lhd_do_nothing_i (int i ATTRIBUTE_UNUSED)
+lhd_do_nothing_i (int ARG_UNUSED (i))
{
}
/* Do nothing (int, int, int). Return NULL_TREE. */
tree
-lhd_do_nothing_iii_return_null_tree (int i ATTRIBUTE_UNUSED,
- int j ATTRIBUTE_UNUSED,
- int k ATTRIBUTE_UNUSED)
+lhd_do_nothing_iii_return_null_tree (int ARG_UNUSED (i),
+ int ARG_UNUSED (j),
+ int ARG_UNUSED (k))
{
return NULL_TREE;
}
@@ -70,7 +70,7 @@ lhd_do_nothing_iii_return_null_tree (int
/* Do nothing (function). */
void
-lhd_do_nothing_f (struct function *f ATTRIBUTE_UNUSED)
+lhd_do_nothing_f (struct function * ARG_UNUSED (f))
{
}
@@ -93,7 +93,7 @@ lhd_return_null_tree_v (void)
/* Do nothing (return NULL_TREE). */
tree
-lhd_return_null_tree (tree t ATTRIBUTE_UNUSED)
+lhd_return_null_tree (tree ARG_UNUSED (t))
{
return NULL_TREE;
}
@@ -101,7 +101,7 @@ lhd_return_null_tree (tree t ATTRIBUTE_U
/* The default post options hook. */
bool
-lhd_post_options (const char **pfilename ATTRIBUTE_UNUSED)
+lhd_post_options (const char ** ARG_UNUSED (pfilename))
{
return false;
}
@@ -109,16 +109,16 @@ lhd_post_options (const char **pfilename
/* Called from by print-tree.c. */
void
-lhd_print_tree_nothing (FILE *file ATTRIBUTE_UNUSED,
- tree node ATTRIBUTE_UNUSED,
- int indent ATTRIBUTE_UNUSED)
+lhd_print_tree_nothing (FILE * ARG_UNUSED (file),
+ tree ARG_UNUSED (node),
+ int ARG_UNUSED (indent))
{
}
/* Called from safe_from_p. */
int
-lhd_safe_from_p (rtx x ATTRIBUTE_UNUSED, tree exp ATTRIBUTE_UNUSED)
+lhd_safe_from_p (rtx ARG_UNUSED (x), tree ARG_UNUSED (exp))
{
return 1;
}
@@ -126,17 +126,17 @@ lhd_safe_from_p (rtx x ATTRIBUTE_UNUSED,
/* Called from unsafe_for_reeval. */
int
-lhd_unsafe_for_reeval (tree t ATTRIBUTE_UNUSED)
+lhd_unsafe_for_reeval (tree ARG_UNUSED (t))
{
return -1;
}
/* Called from staticp. */
-int
-lhd_staticp (tree exp ATTRIBUTE_UNUSED)
+bool
+lhd_staticp (tree ARG_UNUSED (exp))
{
- return 0;
+ return false;
}
/* Called from check_global_declarations. */
@@ -207,21 +207,21 @@ lhd_can_use_bit_fields_p (void)
/* Type promotion for variable arguments. */
tree
-lhd_type_promotes_to (tree type ATTRIBUTE_UNUSED)
+lhd_type_promotes_to (tree ARG_UNUSED (type))
{
abort ();
}
/* Registration of machine- or os-specific builtin types. */
void
-lhd_register_builtin_type (tree type ATTRIBUTE_UNUSED,
- const char* name ATTRIBUTE_UNUSED)
+lhd_register_builtin_type (tree ARG_UNUSED (type),
+ const char * ARG_UNUSED (name))
{
}
/* Invalid use of an incomplete type. */
void
-lhd_incomplete_type_error (tree value ATTRIBUTE_UNUSED, tree type)
+lhd_incomplete_type_error (tree ARG_UNUSED (value), tree type)
{
if (TREE_CODE (type) == ERROR_MARK)
return;
@@ -233,7 +233,7 @@ lhd_incomplete_type_error (tree value AT
is used by languages that don't need to do anything special. */
HOST_WIDE_INT
-lhd_get_alias_set (tree t ATTRIBUTE_UNUSED)
+lhd_get_alias_set (tree ARG_UNUSED (t))
{
return -1;
}
@@ -242,7 +242,7 @@ lhd_get_alias_set (tree t ATTRIBUTE_UNUS
used by languages that haven't deal with alias sets yet. */
HOST_WIDE_INT
-hook_get_alias_set_0 (tree t ATTRIBUTE_UNUSED)
+hook_get_alias_set_0 (tree ARG_UNUSED (t))
{
return 0;
}
@@ -250,10 +250,10 @@ hook_get_alias_set_0 (tree t ATTRIBUTE_U
/* This is the default expand_expr function. */
rtx
-lhd_expand_expr (tree t ATTRIBUTE_UNUSED, rtx r ATTRIBUTE_UNUSED,
- enum machine_mode mm ATTRIBUTE_UNUSED,
- int em ATTRIBUTE_UNUSED,
- rtx *a ATTRIBUTE_UNUSED)
+lhd_expand_expr (tree ARG_UNUSED (t), rtx ARG_UNUSED (r),
+ enum machine_mode ARG_UNUSED (mm),
+ int ARG_UNUSED (em),
+ rtx * ARG_UNUSED (a))
{
abort ();
}
@@ -265,7 +265,7 @@ lhd_expand_expr (tree t ATTRIBUTE_UNUSED
any RTL generation. */
int
-lhd_expand_decl (tree t ATTRIBUTE_UNUSED)
+lhd_expand_decl (tree ARG_UNUSED (t))
{
return 0;
}
@@ -273,7 +273,7 @@ lhd_expand_decl (tree t ATTRIBUTE_UNUSED
/* This is the default decl_printable_name function. */
const char *
-lhd_decl_printable_name (tree decl, int verbosity ATTRIBUTE_UNUSED)
+lhd_decl_printable_name (tree decl, int ARG_UNUSED (verbosity))
{
return IDENTIFIER_POINTER (DECL_NAME (decl));
}
Index: gcc/statistics.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/statistics.h,v
retrieving revision 2.1
diff -u -p -u -p -r2.1 statistics.h
--- gcc/statistics.h 3 Mar 2004 11:25:48 -0000 2.1
+++ gcc/statistics.h 24 Jul 2004 18:38:28 -0000
@@ -23,7 +23,7 @@
#ifndef GCC_STATISTICS
#define GCC_STATISTICS
#ifdef GATHER_STATISTICS
-#define MEM_STAT_DECL , const char *_loc_name ATTRIBUTE_UNUSED, int _loc_line ATTRIBUTE_UNUSED, const char *_loc_function ATTRIBUTE_UNUSED
+#define MEM_STAT_DECL , const char * ARG_UNUSED (_loc_name), int ARG_UNUSED (_loc_line), const char * ARG_UNUSED (_loc_function)
#define PASS_MEM_STAT , _loc_name, _loc_line, _loc_function
#define MEM_STAT_INFO , __FILE__, __LINE__, __FUNCTION__
#else
Index: gcc/stub-objc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/stub-objc.c,v
retrieving revision 2.3
diff -u -p -u -p -r2.3 stub-objc.c
--- gcc/stub-objc.c 16 Jun 2004 01:21:26 -0000 2.3
+++ gcc/stub-objc.c 24 Jul 2004 18:38:28 -0000
@@ -28,37 +28,37 @@ Software Foundation, 59 Temple Place - S
#include "c-common.h"
tree
-lookup_interface (tree arg ATTRIBUTE_UNUSED)
+lookup_interface (tree ARG_UNUSED (arg))
{
return 0;
}
tree
-is_class_name (tree arg ATTRIBUTE_UNUSED)
+is_class_name (tree ARG_UNUSED (arg))
{
return 0;
}
tree
-objc_is_object_ptr (tree arg ATTRIBUTE_UNUSED)
+objc_is_object_ptr (tree ARG_UNUSED (arg))
{
return 0;
}
tree
-lookup_objc_ivar (tree arg ATTRIBUTE_UNUSED)
+lookup_objc_ivar (tree ARG_UNUSED (arg))
{
return 0;
}
void
-objc_check_decl (tree decl ATTRIBUTE_UNUSED)
+objc_check_decl (tree ARG_UNUSED (decl))
{
}
int
-objc_comptypes (tree lhs ATTRIBUTE_UNUSED, tree rhs ATTRIBUTE_UNUSED,
- int reflexive ATTRIBUTE_UNUSED)
+objc_comptypes (tree ARG_UNUSED (lhs), tree ARG_UNUSED (rhs),
+ int ARG_UNUSED (reflexive))
{
return -1;
}
@@ -75,7 +75,7 @@ objc_clear_super_receiver (void)
}
int
-objc_is_public (tree expr ATTRIBUTE_UNUSED, tree identifier ATTRIBUTE_UNUSED)
+objc_is_public (tree ARG_UNUSED (expr), tree ARG_UNUSED (identifier))
{
return 1;
}
Index: gcc/java/decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/decl.c,v
retrieving revision 1.189
diff -u -p -u -p -r1.189 decl.c
--- gcc/java/decl.c 21 Jul 2004 16:03:42 -0000 1.189
+++ gcc/java/decl.c 24 Jul 2004 18:38:35 -0000
@@ -498,6 +498,6 @@ push_promoted_type (const char *name, tr
int function_code,
enum built_in_class class,
const char *library_name,
- tree attrs ATTRIBUTE_UNUSED)
+ tree ARG_UNUSED (attrs))
{
tree decl = build_decl (FUNCTION_DECL, get_identifier (name), type);
DECL_EXTERNAL (decl) = 1;
--
// Bernardo Innocenti - Develer S.r.l., R&D dept.
\X/ http://www.develer.com/