microblaze: Remove support for gcc < 4

[linux-2.6-microblaze.git] / arch / microblaze / kernel / module.c

diff --git a/arch/microblaze/kernel/module.c b/arch/microblaze/kernel/module.c
index 9f12e3c..e5db3a5 100644 (file)
--- a/arch/microblaze/kernel/module.c
+++ b/arch/microblaze/kernel/module.c
@@ -24,9 +24,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
        Elf32_Sym *sym;
        unsigned long int *location;
        unsigned long int value;
-#if __GNUC__ < 4
-       unsigned long int old_value;
-#endif
 
        pr_debug("Applying add relocation section %u to %u\n",
                relsec, sechdrs[relsec].sh_info);
@@ -49,40 +46,17 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                 */
 
                case R_MICROBLAZE_32:
-#if __GNUC__ < 4
-                       old_value = *location;
-                       *location = value + old_value;
-
-                       pr_debug("R_MICROBLAZE_32 (%08lx->%08lx)\n",
-                               old_value, value);
-#else
                        *location = value;
-#endif
                        break;
 
                case R_MICROBLAZE_64:
-#if __GNUC__ < 4
-                       /* Split relocs only required/used pre gcc4.1.1 */
-                       old_value = ((location[0] & 0x0000FFFF) << 16) |
-                                       (location[1] & 0x0000FFFF);
-                       value += old_value;
-#endif
                        location[0] = (location[0] & 0xFFFF0000) |
                                        (value >> 16);
                        location[1] = (location[1] & 0xFFFF0000) |
                                        (value & 0xFFFF);
-#if __GNUC__ < 4
-                       pr_debug("R_MICROBLAZE_64 (%08lx->%08lx)\n",
-                               old_value, value);
-#endif
                        break;
 
                case R_MICROBLAZE_64_PCREL:
-#if __GNUC__ < 4
-                       old_value = (location[0] & 0xFFFF) << 16 |
-                               (location[1] & 0xFFFF);
-                       value -= old_value;
-#endif
                        value -= (unsigned long int)(location) + 4;
                        location[0] = (location[0] & 0xFFFF0000) |
                                        (value >> 16);