ARM: add support for R_ARM_V4BX

Daniel Glöckner committed 16 years ago

Commit 128e46f1 parent 20a1cba2 files · +11 −1Browse files

Unified · Split

2 files

@@ -1673,6 +1673,7 @@ typedef Elf32_Addr Elf32_Conflict; · 1672 unmodified lines
1673	#define R_ARM_PLT32 27 /* 32 bit PLT address */	1673	#define R_ARM_PLT32 27 /* 32 bit PLT address */
1674	#define R_ARM_CALL 28	1674	#define R_ARM_CALL 28
1675	#define R_ARM_JUMP24 29	1675	#define R_ARM_JUMP24 29
		1676	#define R_ARM_V4BX 40
1676	#define R_ARM_PREL31 42	1677	#define R_ARM_PREL31 42
1677	#define R_ARM_GNU_VTENTRY 100	1678	#define R_ARM_GNU_VTENTRY 100
1678	#define R_ARM_GNU_VTINHERIT 101	1679	#define R_ARM_GNU_VTINHERIT 101

             break;
         case R_ARM_COPY:
             break;
+        case R_ARM_V4BX:
+            /* trade Thumb support for ARMv4 support */
+            if ((0x0ffffff0 & *(int*)ptr) == 0x012FFF10)
+                *(int*)ptr ^= 0xE12FFF10 ^ 0xE1A0F000; /* BX Rm -> MOV PC, Rm */
+            break;
         default:
             fprintf(stderr,"FIXME: handle reloc type %x at %lx [%.8x] to %lx\n",
                     type,addr,(unsigned int)(long)ptr,val);
                     goto invalid_reloc;
                 sym_index = old_to_new_syms[sym_index];
                 /* ignore link_once in rel section. */
-                if (!sym_index && !sm->link_once) {
+                if (!sym_index && !sm->link_once
+#ifdef TCC_TARGET_ARM
+                    && type != R_ARM_V4BX
+#endif
+                   ) {
                 invalid_reloc:
                     error_noabort("Invalid relocation entry [%2d] '%s' @ %.8x",
                         i, strsec + sh->sh_name, rel->r_offset);

Keyboard shortcuts