From 4da711b14026562389029483a14b497f2d951522 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 8 Jun 2002 07:39:45 +0000 Subject: [PATCH] * ldexp.c: Replace CONST with const. * ldfile.c: Likewise. * ldfile.h: Likewise. * ldlex.l: Likewise. * mri.c: Likewise. * pe-dll.h: Likewise. --- ld/ChangeLog | 9 +++++++++ ld/ldexp.c | 6 +++--- ld/ldfile.c | 4 ++-- ld/ldfile.h | 4 ++-- ld/ldlex.l | 4 ++-- ld/mri.c | 34 +++++++++++++++++----------------- ld/pe-dll.h | 4 ++-- 7 files changed, 37 insertions(+), 28 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index f003d9f613d..09204f27ee4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2002-06-08 Alan Modra + + * ldexp.c: Replace CONST with const. + * ldfile.c: Likewise. + * ldfile.h: Likewise. + * ldlex.l: Likewise. + * mri.c: Likewise. + * pe-dll.h: Likewise. + 2002-06-07 Alan Modra * emultempl/ppc64elf.em (new_vers_pattern): Warning fix. diff --git a/ld/ldexp.c b/ld/ldexp.c index 264e48f3a8e..3beb4cf99d8 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -75,7 +75,7 @@ exp_print_token (code, infix_p) token_code_type code; int infix_p; { - static CONST struct + static const struct { token_code_type code; char * name; @@ -852,7 +852,7 @@ exp_unop (code, child) etree_type * exp_nameop (code, name) int code; - CONST char *name; + const char *name; { etree_type value, *new; etree_value_type r; @@ -875,7 +875,7 @@ exp_nameop (code, name) etree_type * exp_assop (code, dst, src) int code; - CONST char *dst; + const char *dst; etree_type *src; { etree_type value, *new; diff --git a/ld/ldfile.c b/ld/ldfile.c index 095974c4adf..b23ef452fb1 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -422,7 +422,7 @@ ldfile_add_arch (name) void ldfile_add_arch (in_name) - CONST char *in_name; + const char *in_name; { char *name = xstrdup (in_name); search_arch_type *new = @@ -447,7 +447,7 @@ ldfile_add_arch (in_name) void ldfile_set_output_arch (string) - CONST char *string; + const char *string; { const bfd_arch_info_type *arch = bfd_scan_arch (string); diff --git a/ld/ldfile.h b/ld/ldfile.h index 777932591a4..11a42322ab4 100644 --- a/ld/ldfile.h +++ b/ld/ldfile.h @@ -41,7 +41,7 @@ typedef struct search_dirs { extern search_dirs_type *search_head; -extern void ldfile_add_arch PARAMS ((CONST char *)); +extern void ldfile_add_arch PARAMS ((const char *)); extern void ldfile_add_library_path PARAMS ((const char *, boolean cmdline)); extern void ldfile_open_command_file PARAMS ((const char *name)); extern void ldfile_open_file PARAMS ((struct lang_input_statement_struct *)); @@ -49,7 +49,7 @@ extern boolean ldfile_try_open_bfd PARAMS ((const char *, struct lang_input_statement_struct *)); extern FILE *ldfile_find_command_file PARAMS ((const char *name, const char *extend)); -extern void ldfile_set_output_arch PARAMS ((CONST char *)); +extern void ldfile_set_output_arch PARAMS ((const char *)); extern boolean ldfile_open_file_search PARAMS ((const char *arch, struct lang_input_statement_struct *, const char *lib, const char *suffix)); diff --git a/ld/ldlex.l b/ld/ldlex.l index 9c46a157ae9..cacec192917 100644 --- a/ld/ldlex.l +++ b/ld/ldlex.l @@ -478,7 +478,7 @@ lex_push_file (file, name) static YY_BUFFER_STATE yy_create_string_buffer (string, size) - CONST char *string; + const char *string; size_t size; { YY_BUFFER_STATE b; @@ -520,7 +520,7 @@ yy_create_string_buffer (string, size) void lex_redirect (string) - CONST char *string; + const char *string; { YY_BUFFER_STATE tmp; diff --git a/ld/mri.c b/ld/mri.c index aed6e0263f2..89514e9a0e8 100644 --- a/ld/mri.c +++ b/ld/mri.c @@ -1,5 +1,5 @@ /* mri.c -- handle MRI style linker scripts - Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000 + Copyright 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -36,8 +36,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA struct section_name_struct { struct section_name_struct *next; - CONST char *name; - CONST char *alias; + const char *name; + const char *alias; etree_type *vma; etree_type *align; etree_type *subalign; @@ -62,7 +62,7 @@ static void mri_add_to_list PARAMS ((struct section_name_struct **list, static struct section_name_struct ** lookup (name, list) - CONST char *name; + const char *name; struct section_name_struct **list; { struct section_name_struct **ptr = list; @@ -84,9 +84,9 @@ lookup (name, list) static void mri_add_to_list (list, name, vma, zalias, align, subalign) struct section_name_struct **list; - CONST char *name; + const char *name; etree_type *vma; - CONST char *zalias; + const char *zalias; etree_type *align; etree_type *subalign; { @@ -103,7 +103,7 @@ mri_add_to_list (list, name, vma, zalias, align, subalign) void mri_output_section (name, vma) - CONST char *name; + const char *name; etree_type *vma; { mri_add_to_list (&address, name, vma, 0, 0, 0); @@ -114,7 +114,7 @@ mri_output_section (name, vma) void mri_only_load (name) - CONST char *name; + const char *name; { mri_add_to_list (&only_load, name, 0, 0, 0, 0); } @@ -271,7 +271,7 @@ mri_draw_tree () void mri_load (name) - CONST char *name; + const char *name; { base = 0; lang_add_input_file (name, @@ -283,15 +283,15 @@ mri_load (name) void mri_order (name) - CONST char *name; + const char *name; { mri_add_to_list (&order, name, 0, 0, 0, 0); } void mri_alias (want, is, isn) - CONST char *want; - CONST char *is; + const char *want; + const char *is; int isn; { if (!is) @@ -312,14 +312,14 @@ mri_alias (want, is, isn) void mri_name (name) - CONST char *name; + const char *name; { lang_add_output (name, 1); } void mri_format (name) - CONST char *name; + const char *name; { if (strcmp (name, "S") == 0) lang_add_output_format ("srec", (char *) NULL, (char *) NULL, 1); @@ -336,7 +336,7 @@ mri_format (name) void mri_public (name, exp) - CONST char *name; + const char *name; etree_type *exp; { lang_add_assignment (exp_assop ('=', name, exp)); @@ -344,7 +344,7 @@ mri_public (name, exp) void mri_align (name, exp) - CONST char *name; + const char *name; etree_type *exp; { mri_add_to_list (&alignment, name, 0, 0, exp, 0); @@ -352,7 +352,7 @@ mri_align (name, exp) void mri_alignmod (name, exp) - CONST char *name; + const char *name; etree_type *exp; { mri_add_to_list (&subalignment, name, 0, 0, 0, exp); diff --git a/ld/pe-dll.h b/ld/pe-dll.h index 3c1dd407ecc..b8fcdb93431 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h @@ -1,5 +1,5 @@ /* pe-dll.h: Header file for routines used to build Windows DLLs. - Copyright 1999, 2000 Free Software Foundation, Inc. + Copyright 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -47,7 +47,7 @@ extern void pe_dll_fill_sections PARAMS ((bfd *, struct bfd_link_info *)); extern void pe_exe_fill_sections PARAMS ((bfd *, struct bfd_link_info *)); extern void pe_walk_relocs_of_symbol PARAMS ((struct bfd_link_info * info, - CONST char *name, + const char *name, int (*cb) (arelent *, asection *))); extern void pe_create_import_fixup PARAMS ((arelent * rel));