From 5718918d7aeb65ee118cd7f2cbcc3f1a4cde4ff6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 22 Feb 2005 13:00:26 +0000 Subject: [PATCH] * ldexp.c: Warning fixes. * ldwrite.c: Likewise. * emultempl/elf32.em: Likewise. --- ld/ChangeLog | 6 ++++++ ld/emultempl/elf32.em | 4 ++-- ld/ldexp.c | 2 +- ld/ldwrite.c | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 598253d13c..4bf9e90a63 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2005-02-22 Alan Modra + + * ldexp.c: Warning fixes. + * ldwrite.c: Likewise. + * emultempl/elf32.em: Likewise. + 2005-02-21 H.J. Lu * ldlang.c (lang_add_section): Check SEC_TIC54X_BLOCK for TI diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 5337e1814e..0f90455938 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -1017,8 +1017,8 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" != xgld"$EMULATION_NAME"_before_allocation; ELF_INTERPRETER_SET_DEFAULT=" if (sinterp != NULL) { - sinterp->contents = ${ELF_INTERPRETER_NAME}; - sinterp->size = strlen (sinterp->contents) + 1; + sinterp->contents = (unsigned char *) ${ELF_INTERPRETER_NAME}; + sinterp->size = strlen ((char *) sinterp->contents) + 1; } " diff --git a/ld/ldexp.c b/ld/ldexp.c index 5ac1162ffc..ec25557baf 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -1115,7 +1115,7 @@ exp_get_fill (etree_type *tree, fill = xmalloc ((len + 1) / 2 + sizeof (*fill) - 1); fill->size = (len + 1) / 2; dst = fill->data; - s = r.str; + s = (unsigned char *) r.str; val = 0; do { diff --git a/ld/ldwrite.c b/ld/ldwrite.c index a41a0e96c1..56c4d0a343 100644 --- a/ld/ldwrite.c +++ b/ld/ldwrite.c @@ -1,6 +1,6 @@ /* ldwrite.c -- write out the linked file Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002, - 2003, 2004 Free Software Foundation, Inc. + 2003, 2004, 2005 Free Software Foundation, Inc. Written by Steve Chamberlain sac@cygnus.com This file is part of GLD, the Gnu Linker. @@ -242,7 +242,7 @@ build_link_order (lang_statement_union_type *statement) is going to be output, we'll change it into a fill. */ link_order->type = bfd_data_link_order; - link_order->u.data.contents = ""; + link_order->u.data.contents = (unsigned char *) ""; link_order->u.data.size = 1; } else