Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware

Conflicts:
	com32/lib/sys/module/common.c

diff --cc com32/include/sys/module.h
Simple merge

diff --cc com32/lib/sys/module/common.c
index bc058a6,6e63907..dc3754c
--- 1/com32/lib/sys/module/common.c
--- 2/com32/lib/sys/module/common.c
+++ b/com32/lib/sys/module/common.c
@@@ -429,18 -422,42 +429,42 @@@ int module_unload(struct elf_module *mo
        return _module_unload(module);
  }
  
 -static Elf32_Sym *module_find_symbol_sysv(const char *name, struct elf_module *module) {
+ struct elf_module *unload_modules_since(const char *name) {
+       struct elf_module *m, *mod, *begin = NULL;
+ 
+       for_each_module(mod) {
+               if (!strcmp(mod->name, name)) {
+                       begin = mod;
+                       break;
+               }
+       }
+ 
+       if (!begin)
+               return begin;
+ 
+       for_each_module_safe(mod, m) {
+               if (mod == begin)
+                       break;
+ 
+               if (mod != begin)
+                       module_unload(mod);
+       }
+ 
+       return begin;
+ }
+ 
 +static Elf_Sym *module_find_symbol_sysv(const char *name, struct elf_module *module) {
        unsigned long h = elf_hash((const unsigned char*)name);
 -      Elf32_Word *cr_word = module->hash_table;
 +      Elf_Word *cr_word = module->hash_table;
  
 -      Elf32_Word nbucket = *cr_word++;
 +      Elf_Word nbucket = *cr_word++;
        cr_word++; // Skip nchain
  
 -      Elf32_Word *bkt = cr_word;
 -      Elf32_Word *chn = cr_word + nbucket;
 +      Elf_Word *bkt = cr_word;
 +      Elf_Word *chn = cr_word + nbucket;
  
 -      Elf32_Word crt_index = bkt[h % module->hash_table[0]];
 -      Elf32_Sym *crt_sym;
 +      Elf_Word crt_index = bkt[h % module->hash_table[0]];
 +      Elf_Sym *crt_sym;
  
  
        while (crt_index != STN_UNDEF) {

diff --cc core/elflink/load_env32.c
Simple merge

diff --cc mk/elf.mk
Simple merge