silence warnings in Blackfin ldso code

In file included from ./ldso/include/ldso.h:135,
                 from ldso/ldso/ldso.c:34:
./ldso/ldso/bfin/dl-inlines.h: In function '__dl_init_loadaddr_map':
./ldso/ldso/bfin/dl-inlines.h:43: warning: assignment makes pointer from integer without a cast

In file included from ldso/ldso/ldso.c:43:
ldso/ldso/bfin/elfinterp.c: In function '_dl_do_lazy_reloc':
ldso/ldso/bfin/elfinterp.c:299: warning: assignment makes pointer from integer without a cast

ldso/ldso/ldso.c: In function '_dl_get_ready_to_run':
ldso/ldso/ldso.c:534: warning: assignment makes integer from pointer without a cast

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ldso/ldso/bfin/dl-inlines.h b/ldso/ldso/bfin/dl-inlines.h
index 01f1300..6524f5e 100644 (file)
--- a/ldso/ldso/bfin/dl-inlines.h
+++ b/ldso/ldso/bfin/dl-inlines.h
@@ -40,7 +40,7 @@ __dl_init_loadaddr_map (struct elf32_fdpic_loadaddr *loadaddr, Elf32_Addr dl_boo
       SEND_EARLY_STDERR ("Invalid segment count in loadmap\n");
       _dl_exit(-1);
     }
-  loadaddr->got_value = dl_boot_got_pointer;
+  loadaddr->got_value = (void *)dl_boot_got_pointer;
   loadaddr->map = map;
 }
 

diff --git a/ldso/ldso/bfin/elfinterp.c b/ldso/ldso/bfin/elfinterp.c
index 559a948..6a7bdc5 100644 (file)
--- a/ldso/ldso/bfin/elfinterp.c
+++ b/ldso/ldso/bfin/elfinterp.c
@@ -296,7 +296,7 @@ _dl_do_lazy_reloc (struct elf_resolve *tpnt,
                                break;
                        case R_BFIN_FUNCDESC_VALUE:
                                funcval = *reloc_addr;
-                               funcval.entry_point = DL_RELOC_ADDR(tpnt->loadaddr, funcval.entry_point);
+                               funcval.entry_point = (void *) DL_RELOC_ADDR(tpnt->loadaddr, funcval.entry_point);
                                funcval.got_value = tpnt->loadaddr.got_value;
                                *reloc_addr = funcval;
                                break;

diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 37247cd..19a9fae 100644 (file)
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -531,7 +531,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
         */
        debug_addr->r_map = (struct link_map *) _dl_loaded_modules;
        debug_addr->r_version = 1;
-       debug_addr->r_ldbase = DL_LOADADDR_BASE(load_addr);
+       debug_addr->r_ldbase = (ElfW(Addr)) DL_LOADADDR_BASE(load_addr);
        debug_addr->r_brk = (unsigned long) &_dl_debug_state;
        _dl_debug_addr = debug_addr;