From 0f3f14f1594687ff3a447f9c7e8f552138f49031 Mon Sep 17 00:00:00 2001 From: bg- Date: Mon, 4 Jun 2007 17:47:56 +0000 Subject: [PATCH] * Add cle_info argument to cle_write_reloc. --- core/loader/cle.c | 4 ++-- core/loader/cle.h | 7 +++++-- core/loader/cle_msp430.c | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/core/loader/cle.c b/core/loader/cle.c index 5ae3ad53a..2255c3692 100644 --- a/core/loader/cle.c +++ b/core/loader/cle.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: cle.c,v 1.6 2007/04/26 13:37:28 bg- Exp $ + * @(#)$Id: cle.c,v 1.7 2007/06/04 17:48:19 bg- Exp $ */ /* @@ -260,7 +260,7 @@ cle_relocate(struct cle_info *info, addr += rela.r_addend; - ret = cle_write_reloc(segmem + rela.r_offset, &rela, addr); + ret = cle_write_reloc(segmem + rela.r_offset, &rela, addr, info); if(ret != CLE_OK) { return ret; } diff --git a/core/loader/cle.h b/core/loader/cle.h index 87a850c87..8c15b4080 100644 --- a/core/loader/cle.h +++ b/core/loader/cle.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: cle.h,v 1.6 2007/05/15 10:28:03 bg- Exp $ + * @(#)$Id: cle.h,v 1.7 2007/06/04 17:47:56 bg- Exp $ */ #ifndef CLE_H @@ -92,7 +92,10 @@ cle_lookup(struct cle_info *info, struct elf32_rela; /* Struct forward decl. */ -int cle_write_reloc(unsigned char *, const struct elf32_rela *, cle_addr); +int cle_write_reloc(void *, + const struct elf32_rela *, + cle_addr, + const struct cle_info *); /* * Error codes that apply in general to linking and loading. diff --git a/core/loader/cle_msp430.c b/core/loader/cle_msp430.c index 0f2250bfb..327857813 100644 --- a/core/loader/cle_msp430.c +++ b/core/loader/cle_msp430.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)$Id: cle_msp430.c,v 1.1 2007/04/26 13:38:00 bg- Exp $ + * @(#)$Id: cle_msp430.c,v 1.2 2007/06/04 17:48:32 bg- Exp $ */ /* @@ -54,9 +54,10 @@ * specific! */ int -cle_write_reloc(unsigned char *pos, +cle_write_reloc(void *pos, const struct elf32_rela *rela, - cle_addr addr) + cle_addr addr, + const struct cle_info *info) { memcpy(pos, &addr, 2); /* Write reloc */ return CLE_OK;