aboutsummaryrefslogtreecommitdiff
path: root/modutils/insmod.c
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-30 23:09:20 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-30 23:09:20 +0000
commite4c3642c175326dc960999caa74798de8c703ab5 (patch)
treea78bfa0e539dcdbb024ed1acb9fba333dfacc228 /modutils/insmod.c
parent45d22dce9fb986e738313cd9f1f246255db097e8 (diff)
downloadbusybox-w32-e4c3642c175326dc960999caa74798de8c703ab5.tar.gz
busybox-w32-e4c3642c175326dc960999caa74798de8c703ab5.tar.bz2
busybox-w32-e4c3642c175326dc960999caa74798de8c703ab5.zip
hopefully the last of the annoying signed/unsigned and mixed type errors
git-svn-id: svn://busybox.net/trunk/busybox@13733 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'modutils/insmod.c')
-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,
860#if defined(CONFIG_USE_GOT_ENTRIES) || defined(CONFIG_USE_PLT_ENTRIES) 860#if defined(CONFIG_USE_GOT_ENTRIES) || defined(CONFIG_USE_PLT_ENTRIES)
861 struct arch_symbol *isym = (struct arch_symbol *) sym; 861 struct arch_symbol *isym = (struct arch_symbol *) sym;
862#endif 862#endif
863#if defined(__arm__) || defined(__i386__) || defined(__mc68000__) || defined(__sh__) || defined(__s390__)
863#if defined(CONFIG_USE_GOT_ENTRIES) 864#if defined(CONFIG_USE_GOT_ENTRIES)
864 ElfW(Addr) got = ifile->got ? ifile->got->header.sh_addr : 0; 865 ElfW(Addr) got = ifile->got ? ifile->got->header.sh_addr : 0;
865#endif 866#endif
867#endif
866#if defined(CONFIG_USE_PLT_ENTRIES) 868#if defined(CONFIG_USE_PLT_ENTRIES)
867 ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0; 869 ElfW(Addr) plt = ifile->plt ? ifile->plt->header.sh_addr : 0;
868 unsigned long *ip; 870 unsigned long *ip;
@@ -892,7 +894,7 @@ arch_apply_relocation(struct obj_file *f,
892 * (which is .got) similar to branch, 894 * (which is .got) similar to branch,
893 * but is full 32 bits relative */ 895 * but is full 32 bits relative */
894 896
895 assert(got); 897 assert(got != 0);
896 *loc += got - dot; 898 *loc += got - dot;
897 break; 899 break;
898 900
@@ -901,7 +903,7 @@ arch_apply_relocation(struct obj_file *f,
901 goto bb_use_plt; 903 goto bb_use_plt;
902 904
903 case R_ARM_GOTOFF: /* address relative to the got */ 905 case R_ARM_GOTOFF: /* address relative to the got */
904 assert(got); 906 assert(got != 0);
905 *loc += v - got; 907 *loc += v - got;
906 break; 908 break;
907 909