microblaze: Get module loading working

New reloc type R_MICROBLAZE_32_PCREL_LO requires a null handler (no work to do).

Remove legacy hack for broken linker pre gcc-4.1.1, that required us to extract
an offset from the code, add it to the addend, then rewrite the instruction.

Fixup the invalid reloc type error output.

Boot tested with the xilinx_emaclite ethernet driver.

Signed-off-by: John Williams <john.williams@petalogix.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/arch/microblaze/kernel/module.c b/arch/microblaze/kernel/module.c
index 51414171326f4bb32010585d4cef295e9de8afc4..93a3871ea54108d4cbd4fba5246d811902f2972c 100644 (file)
--- a/arch/microblaze/kernel/module.c
+++ b/arch/microblaze/kernel/module.c
@@ -57,7 +57,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
        Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
        Elf32_Sym *sym;
        unsigned long int *location;
-       unsigned long int locoffs;
        unsigned long int value;
 #if __GNUC__ < 4
        unsigned long int old_value;
@@ -113,10 +112,12 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                        break;
 
                case R_MICROBLAZE_64_PCREL:
-                       locoffs = (location[0] & 0xFFFF) << 16 |
+#if __GNUC__ < 4
+                       old_value = (location[0] & 0xFFFF) << 16 |
                                (location[1] & 0xFFFF);
-                       value -= (unsigned long int)(location) + 4 +
-                               locoffs;
+                       value -= old_value;
+#endif
+                       value -= (unsigned long int)(location) + 4;
                        location[0] = (location[0] & 0xFFFF0000) |
                                        (value >> 16);
                        location[1] = (location[1] & 0xFFFF0000) |
@@ -125,6 +126,10 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                                value);
                        break;
 
+               case R_MICROBLAZE_32_PCREL_LO:
+                       pr_debug("R_MICROBLAZE_32_PCREL_LO\n");
+                       break;
+
                case R_MICROBLAZE_NONE:
                        pr_debug("R_MICROBLAZE_NONE\n");
                        break;
@@ -133,7 +138,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                        printk(KERN_ERR "module %s: "
                                "Unknown relocation: %u\n",
                                module->name,
-                               ELF32_R_TYPE(rela->r_info));
+                               ELF32_R_TYPE(rela[i].r_info));
                        return -ENOEXEC;
                }
        }