X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fnlmconv.c;h=6159dc97ba47c6d4232cb1e1d86d14da794835a8;hb=0112cd268b205d8176b8b4d00988a334822956cf;hp=f064271308c1bda224841c1842e71e7f89515db6;hpb=408f8db182e9d020b5ba2af7d650314ddba1eb84;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c index f064271308..6159dc97ba 100644 --- a/binutils/nlmconv.c +++ b/binutils/nlmconv.c @@ -1,6 +1,6 @@ /* nlmconv.c -- NLM conversion program - Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by Ian Lance Taylor . @@ -37,12 +37,12 @@ #include "bucomm.h" #include "safe-ctype.h" -#include +#include "ansidecl.h" #include #include #include #include -#include +#include "getopt.h" /* Internal BFD NLM header. */ #include "libnlm.h" @@ -56,11 +56,7 @@ /* If strerror is just a macro, we want to use the one from libiberty since it will handle undefined values. */ #undef strerror -extern char *strerror PARAMS ((int)); - -#ifndef localtime -extern struct tm *localtime PARAMS ((const time_t *)); -#endif +extern char *strerror (int); #ifndef SEEK_SET #define SEEK_SET 0 @@ -122,47 +118,37 @@ static struct option long_options[] = /* Local routines. */ -int main PARAMS ((int, char **)); - -static void show_usage PARAMS ((FILE *, int)); -static const char *select_output_format PARAMS ((enum bfd_architecture, - unsigned long, boolean)); -static void setup_sections PARAMS ((bfd *, asection *, PTR)); -static void copy_sections PARAMS ((bfd *, asection *, PTR)); -static void mangle_relocs PARAMS ((bfd *, asection *, arelent ***, - long *, char *, - bfd_size_type)); -static void default_mangle_relocs PARAMS ((bfd *, asection *, arelent ***, - long *, char *, - bfd_size_type)); -static char *link_inputs PARAMS ((struct string_list *, char *)); +int main (int, char **); + +static void show_usage (FILE *, int); +static const char *select_output_format + (enum bfd_architecture, unsigned long, bfd_boolean); +static void setup_sections (bfd *, asection *, void *); +static void copy_sections (bfd *, asection *, void *); +static void mangle_relocs + (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); +static void default_mangle_relocs + (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); +static char *link_inputs (struct string_list *, char *, char *); #ifdef NLMCONV_I386 -static void i386_mangle_relocs PARAMS ((bfd *, asection *, arelent ***, - long *, char *, - bfd_size_type)); +static void i386_mangle_relocs (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); #endif #ifdef NLMCONV_ALPHA -static void alpha_mangle_relocs PARAMS ((bfd *, asection *, arelent ***, - long *, char *, - bfd_size_type)); +static void alpha_mangle_relocs (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); #endif #ifdef NLMCONV_POWERPC -static void powerpc_build_stubs PARAMS ((bfd *, bfd *, asymbol ***, long *)); -static void powerpc_resolve_stubs PARAMS ((bfd *, bfd *)); -static void powerpc_mangle_relocs PARAMS ((bfd *, asection *, arelent ***, - long *, char *, - bfd_size_type)); +static void powerpc_build_stubs (bfd *, bfd *, asymbol ***, long *); +static void powerpc_resolve_stubs (bfd *, bfd *); +static void powerpc_mangle_relocs (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); #endif /* The main routine. */ int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { int opt; char *input_file = NULL; @@ -186,7 +172,7 @@ main (argc, argv) asymbol *endsym; long i; char inlead, outlead; - boolean gotstart, gotexit, gotcheck; + bfd_boolean gotstart, gotexit, gotcheck; struct stat st; FILE *custom_data = NULL; FILE *help_data = NULL; @@ -207,7 +193,7 @@ main (argc, argv) bfd *sharedbfd; size_t shared_offset = 0; size_t shared_size = 0; - Nlm_Internal_Fixed_Header sharedhdr; + static Nlm_Internal_Fixed_Header sharedhdr; int len; char *modname; char **matching; @@ -224,6 +210,8 @@ main (argc, argv) program_name = argv[0]; xmalloc_set_program_name (program_name); + expandargv (&argc, &argv); + bfd_init (); set_default_bfd_target (); @@ -285,29 +273,29 @@ main (argc, argv) /* Initialize the header information to default values. */ fixed_hdr = &fixed_hdr_struct; - memset ((PTR) &fixed_hdr_struct, 0, sizeof fixed_hdr_struct); + memset ((void *) &fixed_hdr_struct, 0, sizeof fixed_hdr_struct); var_hdr = &var_hdr_struct; - memset ((PTR) &var_hdr_struct, 0, sizeof var_hdr_struct); + memset ((void *) &var_hdr_struct, 0, sizeof var_hdr_struct); version_hdr = &version_hdr_struct; - memset ((PTR) &version_hdr_struct, 0, sizeof version_hdr_struct); + memset ((void *) &version_hdr_struct, 0, sizeof version_hdr_struct); copyright_hdr = ©right_hdr_struct; - memset ((PTR) ©right_hdr_struct, 0, sizeof copyright_hdr_struct); + memset ((void *) ©right_hdr_struct, 0, sizeof copyright_hdr_struct); extended_hdr = &extended_hdr_struct; - memset ((PTR) &extended_hdr_struct, 0, sizeof extended_hdr_struct); + memset ((void *) &extended_hdr_struct, 0, sizeof extended_hdr_struct); check_procedure = NULL; custom_file = NULL; - debug_info = false; + debug_info = FALSE; exit_procedure = "_Stop"; export_symbols = NULL; map_file = NULL; - full_map = false; + full_map = FALSE; help_file = NULL; import_symbols = NULL; message_file = NULL; modules = NULL; sharelib_file = NULL; start_procedure = "_Prelude"; - verbose = false; + verbose = FALSE; rpc_file = NULL; parse_errors = 0; @@ -330,7 +318,7 @@ main (argc, argv) if (input_files->next == NULL) input_file = input_files->string; else - input_file = link_inputs (input_files, ld_arg); + input_file = link_inputs (input_files, ld_arg, map_file); } else if (input_file == NULL) { @@ -376,7 +364,8 @@ main (argc, argv) assert (bfd_get_flavour (outbfd) == bfd_target_nlm_flavour); - if (bfd_arch_get_compatible (inbfd, outbfd) == NULL) + /* XXX: Should we accept the unknown bfd format here ? */ + if (bfd_arch_get_compatible (inbfd, outbfd, TRUE) == NULL) non_fatal (_("warning: input and output formats are not compatible")); /* Move the values read from the command file into outbfd. */ @@ -430,7 +419,7 @@ main (argc, argv) #endif /* Set up the sections. */ - bfd_map_over_sections (inbfd, setup_sections, (PTR) outbfd); + bfd_map_over_sections (inbfd, setup_sections, (void *) outbfd); text_sec = bfd_get_section_by_name (outbfd, NLM_CODE_NAME); @@ -440,7 +429,7 @@ main (argc, argv) { bfd_size_type add; - vma = bfd_get_section_size_before_reloc (data_sec); + vma = bfd_get_section_size (data_sec); align = 1 << bss_sec->alignment_power; add = ((vma + align - 1) &~ (align - 1)) - vma; vma += add; @@ -450,7 +439,7 @@ main (argc, argv) { bfd_size_type data_size; - data_size = bfd_get_section_size_before_reloc (data_sec); + data_size = bfd_get_section_size (data_sec); if (! bfd_set_section_size (outbfd, data_sec, data_size + add)) bfd_fatal (_("set .data size")); } @@ -459,16 +448,16 @@ main (argc, argv) /* Adjust symbol information. */ inlead = bfd_get_symbol_leading_char (inbfd); outlead = bfd_get_symbol_leading_char (outbfd); - gotstart = false; - gotexit = false; - gotcheck = false; + gotstart = FALSE; + gotexit = FALSE; + gotcheck = FALSE; newsymalloc = 10; newsyms = (asymbol **) xmalloc (newsymalloc * sizeof (asymbol *)); newsymcount = 0; endsym = NULL; for (i = 0; i < symcount; i++) { - register asymbol *sym; + asymbol *sym; sym = symbols[i]; @@ -508,14 +497,14 @@ main (argc, argv) symbols into the .bss section, and mark them as exported. */ if (bfd_is_com_section (bfd_get_section (sym))) { - bfd_vma size; + bfd_vma size = sym->value; sym->section = bss_sec; - size = sym->value; - sym->value = bss_sec->_raw_size; - bss_sec->_raw_size += size; + sym->value = bfd_get_section_size (bss_sec); + size += sym->value; align = 1 << bss_sec->alignment_power; - bss_sec->_raw_size = (bss_sec->_raw_size + align - 1) &~ (align - 1); + size = (size + align - 1) & ~(align - 1); + bfd_set_section_size (outbfd, bss_sec, size); sym->flags |= BSF_EXPORT | BSF_GLOBAL; } else if (bfd_get_section (sym)->output_section != NULL) @@ -559,12 +548,12 @@ main (argc, argv) sym->section = got_sec->output_section; } #endif - } + } /* If this is a global symbol, check the export list. */ if ((sym->flags & (BSF_EXPORT | BSF_GLOBAL)) != 0) { - register struct string_list *l; + struct string_list *l; int found_simple; /* Unfortunately, a symbol can appear multiple times on the @@ -587,7 +576,7 @@ main (argc, argv) { newsymalloc += 10; newsyms = ((asymbol **) - xrealloc ((PTR) newsyms, + xrealloc ((void *) newsyms, (newsymalloc * sizeof (asymbol *)))); } @@ -612,7 +601,7 @@ main (argc, argv) Change the prefix if necessary. */ if (bfd_is_und_section (bfd_get_section (sym))) { - register struct string_list *l; + struct string_list *l; for (l = import_symbols; l != NULL; l = l->next) { @@ -635,7 +624,7 @@ main (argc, argv) non_fatal (_("warning: symbol %s imported but not in import list"), bfd_asymbol_name (sym)); } - + /* See if it's one of the special named symbols. */ if ((sym->flags & BSF_DEBUGGING) == 0) { @@ -653,7 +642,7 @@ main (argc, argv) val += bfd_section_size (outbfd, text_sec); if (! bfd_set_start_address (outbfd, val)) bfd_fatal (_("set start address")); - gotstart = true; + gotstart = TRUE; } if (strcmp (bfd_asymbol_name (sym), exit_procedure) == 0) { @@ -662,7 +651,7 @@ main (argc, argv) && text_sec != (asection *) NULL) val += bfd_section_size (outbfd, text_sec); nlm_fixed_header (outbfd)->exitProcedureOffset = val; - gotexit = true; + gotexit = TRUE; } if (check_procedure != NULL && strcmp (bfd_asymbol_name (sym), check_procedure) == 0) @@ -672,14 +661,14 @@ main (argc, argv) && text_sec != (asection *) NULL) val += bfd_section_size (outbfd, text_sec); nlm_fixed_header (outbfd)->checkUnloadProcedureOffset = val; - gotcheck = true; + gotcheck = TRUE; } } } if (endsym != NULL) { - endsym->value = bfd_get_section_size_before_reloc (bss_sec); + endsym->value = bfd_get_section_size (bss_sec); /* FIXME: If any relocs referring to _end use inplace addends, then I think they need to be updated. This is handled by @@ -699,7 +688,7 @@ main (argc, argv) } bfd_set_symtab (outbfd, outsyms, symcount + newsymcount); - + if (! gotstart) non_fatal (_("warning: START procedure %s not defined"), start_procedure); if (! gotexit) @@ -748,7 +737,7 @@ main (argc, argv) || ! bfd_set_section_flags (outbfd, help_section, SEC_HAS_CONTENTS)) bfd_fatal (_("help section")); - strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); + CONST_STRNCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); } } if (message_file != NULL) @@ -770,7 +759,7 @@ main (argc, argv) || ! bfd_set_section_flags (outbfd, message_section, SEC_HAS_CONTENTS)) bfd_fatal (_("message section")); - strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); + CONST_STRNCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); } } if (modules != NULL) @@ -806,7 +795,7 @@ main (argc, argv) || ! bfd_set_section_flags (outbfd, rpc_section, SEC_HAS_CONTENTS)) bfd_fatal (_("rpc section")); - strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); + CONST_STRNCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); } } if (sharelib_file != NULL) @@ -863,20 +852,20 @@ main (argc, argv) || ! bfd_set_section_flags (outbfd, shared_section, SEC_HAS_CONTENTS)) bfd_fatal (_("shared section")); - strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); + CONST_STRNCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); } } } /* Check whether a version was given. */ - if (strncmp (version_hdr->stamp, "VeRsIoN#", 8) != 0) + if (!CONST_STRNEQ (version_hdr->stamp, "VeRsIoN#")) non_fatal (_("warning: No version number given")); /* At least for now, always create an extended header, because that is what NLMLINK does. */ - strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); + CONST_STRNCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); - strncpy (nlm_cygnus_ext_header (outbfd)->stamp, "CyGnUsEx", 8); + CONST_STRNCPY (nlm_cygnus_ext_header (outbfd)->stamp, "CyGnUsEx"); /* If the date was not given, force it in. */ if (nlm_version_header (outbfd)->month == 0 @@ -891,7 +880,7 @@ main (argc, argv) nlm_version_header (outbfd)->month = ptm->tm_mon + 1; nlm_version_header (outbfd)->day = ptm->tm_mday; nlm_version_header (outbfd)->year = ptm->tm_year + 1900; - strncpy (version_hdr->stamp, "VeRsIoN#", 8); + CONST_STRNCPY (version_hdr->stamp, "VeRsIoN#"); } #ifdef NLMCONV_POWERPC @@ -901,12 +890,12 @@ main (argc, argv) #endif /* Copy over the sections. */ - bfd_map_over_sections (inbfd, copy_sections, (PTR) outbfd); + bfd_map_over_sections (inbfd, copy_sections, (void *) outbfd); /* Finish up the header information. */ if (custom_file != NULL) { - PTR data; + void *data; data = xmalloc (custom_size); if (fread (data, 1, custom_size, custom_data) != custom_size) @@ -931,11 +920,11 @@ main (argc, argv) export information and the debugging information. */ nlm_fixed_header (outbfd)->debugInfoOffset = (file_ptr) -1; } - if (map_file != NULL) - non_fatal (_("warning: MAP and FULLMAP are not supported; try ld -M")); + if (full_map) + non_fatal (_("warning: FULLMAP is not supported; try ld -M")); if (help_file != NULL) { - PTR data; + void *data; data = xmalloc (help_size); if (fread (data, 1, help_size, help_data) != help_size) @@ -953,7 +942,7 @@ main (argc, argv) } if (message_file != NULL) { - PTR data; + void *data; data = xmalloc (message_size); if (fread (data, 1, message_size, message_data) != message_size) @@ -978,7 +967,7 @@ main (argc, argv) } if (modules != NULL) { - PTR data; + void *data; unsigned char *set; struct string_list *l; bfd_size_type c; @@ -989,7 +978,7 @@ main (argc, argv) for (l = modules; l != NULL; l = l->next) { *set = strlen (l->string); - strncpy (set + 1, l->string, *set); + strncpy ((char *) set + 1, l->string, *set); set += *set + 1; ++c; } @@ -1002,7 +991,7 @@ main (argc, argv) } if (rpc_file != NULL) { - PTR data; + void *data; data = xmalloc (rpc_size); if (fread (data, 1, rpc_size, rpc_data) != rpc_size) @@ -1020,7 +1009,7 @@ main (argc, argv) } if (sharelib_file != NULL) { - PTR data; + void *data; data = xmalloc (shared_size); if (fseek (shared_data, shared_offset, SEEK_SET) != 0 @@ -1066,18 +1055,24 @@ main (argc, argv) sharedhdr.exitProcedureOffset; free (data); } - len = strlen (output_file); - if (len > NLM_MODULE_NAME_SIZE - 2) - len = NLM_MODULE_NAME_SIZE - 2; - nlm_fixed_header (outbfd)->moduleName[0] = len; - - strncpy (nlm_fixed_header (outbfd)->moduleName + 1, output_file, - NLM_MODULE_NAME_SIZE - 2); - nlm_fixed_header (outbfd)->moduleName[NLM_MODULE_NAME_SIZE - 1] = '\0'; - for (modname = nlm_fixed_header (outbfd)->moduleName; - *modname != '\0'; - modname++) - *modname = TOUPPER (*modname); + + { + const int max_len = NLM_MODULE_NAME_SIZE - 2; + const char * filename = lbasename (output_file); + + len = strlen (filename); + if (len > max_len) + len = max_len; + nlm_fixed_header (outbfd)->moduleName[0] = len; + + strncpy (nlm_fixed_header (outbfd)->moduleName + 1, filename, max_len); + nlm_fixed_header (outbfd)->moduleName[max_len + 1] = '\0'; + + for (modname = nlm_fixed_header (outbfd)->moduleName; + *modname != '\0'; + modname++) + *modname = TOUPPER (*modname); + } strncpy (nlm_variable_header (outbfd)->oldThreadName, " LONG", NLM_OLD_THREAD_NAME_LENGTH); @@ -1100,9 +1095,7 @@ main (argc, argv) /* Show a usage message and exit. */ static void -show_usage (file, status) - FILE *file; - int status; +show_usage (FILE *file, int status) { fprintf (file, _("Usage: %s [option(s)] [in-file [out-file]]\n"), program_name); fprintf (file, _(" Convert an object file into a NetWare Loadable Module\n")); @@ -1112,6 +1105,7 @@ show_usage (file, status) -T --header-file= Read for NLM header information\n\ -l --linker= Use for any linking\n\ -d --debug Display on stderr the linker command line\n\ + @ Read options from .\n\ -h --help Display this information\n\ -v --version Display the program's version\n\ ")); @@ -1124,10 +1118,8 @@ show_usage (file, status) and endianness. This chooses the appropriate NLM target. */ static const char * -select_output_format (arch, mach, bigendian) - enum bfd_architecture arch; - unsigned long mach; - boolean bigendian ATTRIBUTE_UNUSED; +select_output_format (enum bfd_architecture arch, unsigned long mach, + bfd_boolean bigendian ATTRIBUTE_UNUSED) { switch (arch) { @@ -1159,10 +1151,7 @@ select_output_format (arch, mach, bigendian) name, size, etc. */ static void -setup_sections (inbfd, insec, data_ptr) - bfd *inbfd ATTRIBUTE_UNUSED; - asection *insec; - PTR data_ptr; +setup_sections (bfd *inbfd ATTRIBUTE_UNUSED, asection *insec, void *data_ptr) { bfd *outbfd = (bfd *) data_ptr; flagword f; @@ -1229,17 +1218,14 @@ setup_sections (inbfd, insec, data_ptr) /* Copy the section contents. */ static void -copy_sections (inbfd, insec, data_ptr) - bfd *inbfd; - asection *insec; - PTR data_ptr; +copy_sections (bfd *inbfd, asection *insec, void *data_ptr) { static bfd_size_type secsecoff = 0; bfd *outbfd = (bfd *) data_ptr; const char *inname; asection *outsec; bfd_size_type size; - PTR contents; + void *contents; long reloc_size; bfd_byte buf[4]; bfd_size_type add; @@ -1249,11 +1235,7 @@ copy_sections (inbfd, insec, data_ptr) outsec = insec->output_section; assert (outsec != NULL); - size = bfd_get_section_size_before_reloc (insec); - - /* FIXME: Why are these necessary? */ - insec->_cooked_size = insec->_raw_size; - insec->reloc_done = true; + size = bfd_get_section_size (insec); if ((bfd_get_section_flags (inbfd, insec) & SEC_HAS_CONTENTS) == 0) contents = NULL; @@ -1309,7 +1291,7 @@ copy_sections (inbfd, insec, data_ptr) } /* Add this section to .nlmsections. */ - if (! bfd_set_section_contents (outbfd, secsec, (PTR) inname, secsecoff, + if (! bfd_set_section_contents (outbfd, secsec, (void *) inname, secsecoff, strlen (inname) + 1)) bfd_fatal (_("set .nlmsection contents")); secsecoff += strlen (inname) + 1; @@ -1341,14 +1323,9 @@ copy_sections (inbfd, insec, data_ptr) by the input formats. */ static void -mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, - contents_size) - bfd *outbfd; - asection *insec; - arelent ***relocs_ptr; - long *reloc_count_ptr; - char *contents; - bfd_size_type contents_size; +mangle_relocs (bfd *outbfd, asection *insec, arelent ***relocs_ptr, + long *reloc_count_ptr, char *contents, + bfd_size_type contents_size) { switch (bfd_get_arch (outbfd)) { @@ -1380,22 +1357,17 @@ mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, /* By default all we need to do for relocs is change the address by the output_offset. */ -/*ARGSUSED*/ static void -default_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, - contents_size) - bfd *outbfd ATTRIBUTE_UNUSED; - asection *insec; - arelent ***relocs_ptr; - long *reloc_count_ptr; - char *contents ATTRIBUTE_UNUSED; - bfd_size_type contents_size ATTRIBUTE_UNUSED; +default_mangle_relocs (bfd *outbfd ATTRIBUTE_UNUSED, asection *insec, + arelent ***relocs_ptr, long *reloc_count_ptr, + char *contents ATTRIBUTE_UNUSED, + bfd_size_type contents_size ATTRIBUTE_UNUSED) { if (insec->output_offset != 0) { long reloc_count; - register arelent **relocs; - register long i; + arelent **relocs; + long i; reloc_count = *reloc_count_ptr; relocs = *relocs_ptr; @@ -1417,25 +1389,20 @@ static reloc_howto_type nlm_i386_pcrel_howto = 0, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - true, /* pc_relative */ + TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_signed, /* complain_on_overflow */ 0, /* special_function */ "DISP32", /* name */ - true, /* partial_inplace */ + TRUE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - true); /* pcrel_offset */ + TRUE); /* pcrel_offset */ static void -i386_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, - contents_size) - bfd *outbfd; - asection *insec; - arelent ***relocs_ptr; - long *reloc_count_ptr; - char *contents; - bfd_size_type contents_size; +i386_mangle_relocs (bfd *outbfd, asection *insec, arelent ***relocs_ptr, + long *reloc_count_ptr, char *contents, + bfd_size_type contents_size) { long reloc_count, i; arelent **relocs; @@ -1575,30 +1542,25 @@ static reloc_howto_type nlm32_alpha_nw_howto = 0, /* rightshift */ 0, /* size (0 = byte, 1 = short, 2 = long) */ 0, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ 0, /* special_function */ "NW_RELOC", /* name */ - false, /* partial_inplace */ + FALSE, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - false); /* pcrel_offset */ + FALSE); /* pcrel_offset */ -/*ARGSUSED*/ static void -alpha_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, - contents_size) - bfd *outbfd; - asection *insec; - register arelent ***relocs_ptr; - long *reloc_count_ptr; - char *contents ATTRIBUTE_UNUSED; - bfd_size_type contents_size ATTRIBUTE_UNUSED; +alpha_mangle_relocs (bfd *outbfd, asection *insec, + arelent ***relocs_ptr, long *reloc_count_ptr, + char *contents ATTRIBUTE_UNUSED, + bfd_size_type contents_size ATTRIBUTE_UNUSED) { long old_reloc_count; arelent **old_relocs; - register arelent **relocs; + arelent **relocs; old_reloc_count = *reloc_count_ptr; old_relocs = *relocs_ptr; @@ -1647,15 +1609,14 @@ alpha_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, ++relocs; ++(*reloc_count_ptr); - memcpy ((PTR) relocs, (PTR) old_relocs, - (size_t) old_reloc_count * sizeof (arelent *)); + memcpy (relocs, old_relocs, (size_t) old_reloc_count * sizeof (arelent *)); relocs[old_reloc_count] = (arelent *) NULL; free (old_relocs); if (insec->output_offset != 0) { - register bfd_size_type i; + bfd_size_type i; for (i = 0; i < (bfd_size_type) old_reloc_count; i++, relocs++) (*relocs)->address += insec->output_offset; @@ -1724,11 +1685,8 @@ static bfd_size_type powerpc_initial_got_size; build a stub for each one. */ static void -powerpc_build_stubs (inbfd, outbfd, symbols_ptr, symcount_ptr) - bfd *inbfd; - bfd *outbfd ATTRIBUTE_UNUSED; - asymbol ***symbols_ptr; - long *symcount_ptr; +powerpc_build_stubs (bfd *inbfd, bfd *outbfd ATTRIBUTE_UNUSED, + asymbol ***symbols_ptr, long *symcount_ptr) { asection *stub_sec; asection *got_sec; @@ -1810,7 +1768,7 @@ powerpc_build_stubs (inbfd, outbfd, symbols_ptr, symcount_ptr) item->next = powerpc_stubs; powerpc_stubs = item; - + ++stubcount; } @@ -1844,9 +1802,7 @@ powerpc_build_stubs (inbfd, outbfd, symbols_ptr, symcount_ptr) of the output section, and create new relocs in the TOC. */ static void -powerpc_resolve_stubs (inbfd, outbfd) - bfd *inbfd; - bfd *outbfd; +powerpc_resolve_stubs (bfd *inbfd, bfd *outbfd) { bfd_byte buf[POWERPC_STUB_SIZE]; unsigned int i; @@ -1893,7 +1849,7 @@ powerpc_resolve_stubs (inbfd, outbfd) reloc->address = l->toc_index + got_sec->output_offset; reloc->addend = 0; reloc->howto = bfd_reloc_type_lookup (inbfd, BFD_RELOC_32); - + *r++ = reloc; } @@ -1906,21 +1862,16 @@ powerpc_resolve_stubs (inbfd, outbfd) r2, will be set to the correct TOC value, so there is no need for any further reloc. */ -/*ARGSUSED*/ static void -powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, - contents_size) - bfd *outbfd; - asection *insec; - register arelent ***relocs_ptr; - long *reloc_count_ptr; - char *contents; - bfd_size_type contents_size ATTRIBUTE_UNUSED; +powerpc_mangle_relocs (bfd *outbfd, asection *insec, + arelent ***relocs_ptr, + long *reloc_count_ptr, char *contents, + bfd_size_type contents_size ATTRIBUTE_UNUSED) { reloc_howto_type *toc_howto; long reloc_count; - register arelent **relocs; - register long i; + arelent **relocs; + long i; toc_howto = bfd_reloc_type_lookup (insec->owner, BFD_RELOC_PPC_TOC16); if (toc_howto == (reloc_howto_type *) NULL) @@ -1931,8 +1882,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, going to write out whatever we return in the contents field. */ if (strcmp (bfd_get_section_name (insec->owner, insec), ".got") == 0) memset (contents + powerpc_initial_got_size, 0, - (size_t) (bfd_get_section_size_after_reloc (insec) - - powerpc_initial_got_size)); + (size_t) (bfd_get_section_size (insec) - powerpc_initial_got_size)); reloc_count = *reloc_count_ptr; relocs = *relocs_ptr; @@ -2091,9 +2041,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, file. */ static char * -link_inputs (inputs, ld) - struct string_list *inputs; - char *ld; +link_inputs (struct string_list *inputs, char *ld, char * map_file) { size_t c; struct string_list *q; @@ -2108,7 +2056,7 @@ link_inputs (inputs, ld) for (q = inputs; q != NULL; q = q->next) ++c; - argv = (char **) alloca ((c + 5) * sizeof(char *)); + argv = (char **) alloca ((c + 7) * sizeof (char *)); #ifndef __MSDOS__ if (ld == NULL) @@ -2140,7 +2088,19 @@ link_inputs (inputs, ld) argv[1] = (char *) "-Ur"; argv[2] = (char *) "-o"; argv[3] = unlink_on_exit; - i = 4; + /* If we have been given the name of a mapfile and that + name is not 'stderr' then pass it on to the linker. */ + if (map_file + && * map_file + && strcmp (map_file, "stderr") == 0) + { + argv[4] = (char *) "-Map"; + argv[5] = map_file; + i = 6; + } + else + i = 4; + for (q = inputs; q != NULL; q = q->next, i++) argv[i] = q->string; argv[i] = NULL;