From b2416f7bf39ba0ba4c5d70cfdbbb11fff493d676 Mon Sep 17 00:00:00 2001 From: amodra Date: Thu, 12 Dec 2002 21:10:08 +0000 Subject: [PATCH] * dlltool.c (mcore_elf_gen_out_file): Replace all occurrences of dyn_string_append with dyn_string_append_cstr. * emul_aix.c (ar_emul_aix_create): Remove unused function. --- binutils/ChangeLog | 7 +++++++ binutils/dlltool.c | 52 ++++++++++++++++++++++++++-------------------------- binutils/emul_aix.c | 19 ------------------- 3 files changed, 33 insertions(+), 45 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 97b70840b7..8c9b25a07b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2002-12-13 Alan Modra + + * dlltool.c (mcore_elf_gen_out_file): Replace all occurrences of + dyn_string_append with dyn_string_append_cstr. + + * emul_aix.c (ar_emul_aix_create): Remove unused function. + 2002-12-10 James Cownie * readelf.h (get_TAG_name, get_AT_name, diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 3fecf16d68..19a7e1f8f1 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -3634,21 +3634,21 @@ mcore_elf_gen_out_file (void) ptr = & fnames; ds = dyn_string_new (100); - dyn_string_append (ds, "-r "); + dyn_string_append_cstr (ds, "-r "); if (mcore_elf_linker_flags != NULL) - dyn_string_append (ds, mcore_elf_linker_flags); + dyn_string_append_cstr (ds, mcore_elf_linker_flags); while (ptr->next != NULL) { - dyn_string_append (ds, ptr->filename); - dyn_string_append (ds, " "); + dyn_string_append_cstr (ds, ptr->filename); + dyn_string_append_cstr (ds, " "); ptr = ptr->next; } - dyn_string_append (ds, "-o "); - dyn_string_append (ds, MCORE_ELF_TMP_OBJ); + dyn_string_append_cstr (ds, "-o "); + dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ); if (mcore_elf_linker == NULL) mcore_elf_linker = deduce_name ("ld"); @@ -3661,25 +3661,25 @@ mcore_elf_gen_out_file (void) Do this by recursively invoking dlltool... */ ds = dyn_string_new (100); - dyn_string_append (ds, "-S "); - dyn_string_append (ds, as_name); + dyn_string_append_cstr (ds, "-S "); + dyn_string_append_cstr (ds, as_name); - dyn_string_append (ds, " -e "); - dyn_string_append (ds, MCORE_ELF_TMP_EXP); - dyn_string_append (ds, " -l "); - dyn_string_append (ds, MCORE_ELF_TMP_LIB); - dyn_string_append (ds, " " ); - dyn_string_append (ds, MCORE_ELF_TMP_OBJ); + dyn_string_append_cstr (ds, " -e "); + dyn_string_append_cstr (ds, MCORE_ELF_TMP_EXP); + dyn_string_append_cstr (ds, " -l "); + dyn_string_append_cstr (ds, MCORE_ELF_TMP_LIB); + dyn_string_append_cstr (ds, " " ); + dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ); if (verbose) - dyn_string_append (ds, " -v"); + dyn_string_append_cstr (ds, " -v"); if (dontdeltemps) { - dyn_string_append (ds, " -n"); + dyn_string_append_cstr (ds, " -n"); if (dontdeltemps > 1) - dyn_string_append (ds, " -n"); + dyn_string_append_cstr (ds, " -n"); } /* XXX - FIME: ought to check/copy other command line options as well. */ @@ -3690,17 +3690,17 @@ mcore_elf_gen_out_file (void) /* Step four. Feed the .exp and object files to ld -shared to create the dll. */ ds = dyn_string_new (100); - dyn_string_append (ds, "-shared "); + dyn_string_append_cstr (ds, "-shared "); if (mcore_elf_linker_flags) - dyn_string_append (ds, mcore_elf_linker_flags); - - dyn_string_append (ds, " "); - dyn_string_append (ds, MCORE_ELF_TMP_EXP); - dyn_string_append (ds, " "); - dyn_string_append (ds, MCORE_ELF_TMP_OBJ); - dyn_string_append (ds, " -o "); - dyn_string_append (ds, mcore_elf_out_file); + dyn_string_append_cstr (ds, mcore_elf_linker_flags); + + dyn_string_append_cstr (ds, " "); + dyn_string_append_cstr (ds, MCORE_ELF_TMP_EXP); + dyn_string_append_cstr (ds, " "); + dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ); + dyn_string_append_cstr (ds, " -o "); + dyn_string_append_cstr (ds, mcore_elf_out_file); run (mcore_elf_linker, ds->s); diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c index 60534f79ed..cbb0894c2f 100644 --- a/binutils/emul_aix.c +++ b/binutils/emul_aix.c @@ -146,25 +146,6 @@ ar_emul_aix5_replace (after_bfd, file_name, verbose) "aix5coff64-rs6000", FALSE); } -bfd_boolean -ar_emul_aix_create (abfd_out, archive_file_name, file_name) - bfd **abfd_out; - char *archive_file_name; - char *file_name ATTRIBUTE_UNUSED; -{ - char *target = "aixcoff-rs6000"; - - /* Create an empty archive. */ - *abfd_out = bfd_openw (archive_file_name, target); - - if (*abfd_out == NULL) - bfd_fatal (archive_file_name); - - /* set to small or big format. */ - /* not done. */ - return TRUE; -} - static bfd_boolean ar_emul_aix_parse_arg (arg) char *arg; -- 2.11.0