aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2006-01-30 23:09:20 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2006-01-30 23:09:20 +0000
commit3496fdc9a573a424e34141cbe04250cc8df15e32 (patch)
treea78bfa0e539dcdbb024ed1acb9fba333dfacc228 /modutils
parenta68ea1cb93c29125bc4f30ddd415fca02249e010 (diff)
downloadbusybox-3496fdc9a573a424e34141cbe04250cc8df15e32.tar.gz
busybox-3496fdc9a573a424e34141cbe04250cc8df15e32.tar.bz2
hopefully the last of the annoying signed/unsigned and mixed type errors
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 390a50316..96d9d5b7d 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -860,9 +860,11 @@ arch_apply_relocation(struct obj_file *f,
#if defined(CONFIG_USE_GOT_ENTRIES) || defined(CONFIG_USE_PLT_ENTRIES)
struct arch_symbol *isym = (struct arch_symbol *) sym;
#endif
+#if defined(__arm__) || defined(__i386__) || defined(__mc68000__) || defined(__sh__) || defined(__s390__)
#if defined(CONFIG_USE_GOT_ENTRIES)
ElfW(Addr) got = ifile->got ? ifile->got->header.sh_addr : 0;
#endif
+#endif
#if defined(CONFIG_USE_PLT_ENTRIES)
ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0;
unsigned long *ip;
@@ -892,7 +894,7 @@ arch_apply_relocation(struct obj_file *f,
* (which is .got) similar to branch,
* but is full 32 bits relative */
- assert(got);
+ assert(got != 0);
*loc += got - dot;
break;
@@ -901,7 +903,7 @@ arch_apply_relocation(struct obj_file *f,
goto bb_use_plt;
case R_ARM_GOTOFF: /* address relative to the got */
- assert(got);
+ assert(got != 0);
*loc += v - got;
break;