* ldexp.c: Warning fixes.

	* ldwrite.c: Likewise.
	* emultempl/elf32.em: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 598253d..4bf9e90 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-22  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldexp.c: Warning fixes.
+       * ldwrite.c: Likewise.
+       * emultempl/elf32.em: Likewise.
+
 2005-02-21  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ldlang.c (lang_add_section): Check SEC_TIC54X_BLOCK for TI

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 5337e18..0f90455 100644 (file)
--- 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 5ac1162..ec25557 100644 (file)
--- 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 a41a0e9..56c4d0a 100644 (file)
--- 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