Skip to content

Commit 44782ad

Browse files
awojasinskicarlescufi
authored andcommitted
llext: Move arm-specific relocation names from generic LLEXT file
Moved symbol definitions to the pleace where they are used. Signed-off-by: Adam Wojasinski <[email protected]>
1 parent 62458fe commit 44782ad

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

arch/arm/core/elf.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,34 @@
1212

1313
LOG_MODULE_REGISTER(elf, CONFIG_LLEXT_LOG_LEVEL);
1414

15+
#define R_ARM_NONE 0
16+
#define R_ARM_PC24 1
17+
#define R_ARM_ABS32 2
18+
#define R_ARM_REL32 3
19+
#define R_ARM_COPY 20
20+
#define R_ARM_GLOB_DAT 21
21+
#define R_ARM_JUMP_SLOT 22
22+
#define R_ARM_RELATIVE 23
23+
#define R_ARM_CALL 28
24+
#define R_ARM_JUMP24 29
25+
#define R_ARM_TARGET1 38
26+
#define R_ARM_V4BX 40
27+
#define R_ARM_PREL31 42
28+
#define R_ARM_MOVW_ABS_NC 43
29+
#define R_ARM_MOVT_ABS 44
30+
#define R_ARM_MOVW_PREL_NC 45
31+
#define R_ARM_MOVT_PREL 46
32+
#define R_ARM_ALU_PC_G0_NC 57
33+
#define R_ARM_ALU_PC_G1_NC 59
34+
#define R_ARM_LDR_PC_G2 63
35+
36+
#define R_ARM_THM_CALL 10
37+
#define R_ARM_THM_JUMP24 30
38+
#define R_ARM_THM_MOVW_ABS_NC 47
39+
#define R_ARM_THM_MOVT_ABS 48
40+
#define R_ARM_THM_MOVW_PREL_NC 49
41+
#define R_ARM_THM_MOVT_PREL 50
42+
1543
#define OPCODE2ARMMEM(x) ((uint32_t)(x))
1644
#define OPCODE2THM16MEM(x) ((uint16_t)(x))
1745
#define MEM2ARMOPCODE(x) OPCODE2ARMMEM(x)

include/zephyr/llext/elf.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -407,34 +407,6 @@ struct elf64_rela {
407407
#define R_386_JMP_SLOT 7
408408
#define R_386_RELATIVE 8
409409
#define R_386_GOTOFF 9
410-
411-
#define R_ARM_NONE 0
412-
#define R_ARM_PC24 1
413-
#define R_ARM_ABS32 2
414-
#define R_ARM_REL32 3
415-
#define R_ARM_COPY 20
416-
#define R_ARM_GLOB_DAT 21
417-
#define R_ARM_JUMP_SLOT 22
418-
#define R_ARM_RELATIVE 23
419-
#define R_ARM_CALL 28
420-
#define R_ARM_JUMP24 29
421-
#define R_ARM_TARGET1 38
422-
#define R_ARM_V4BX 40
423-
#define R_ARM_PREL31 42
424-
#define R_ARM_MOVW_ABS_NC 43
425-
#define R_ARM_MOVT_ABS 44
426-
#define R_ARM_MOVW_PREL_NC 45
427-
#define R_ARM_MOVT_PREL 46
428-
#define R_ARM_ALU_PC_G0_NC 57
429-
#define R_ARM_ALU_PC_G1_NC 59
430-
#define R_ARM_LDR_PC_G2 63
431-
432-
#define R_ARM_THM_CALL 10
433-
#define R_ARM_THM_JUMP24 30
434-
#define R_ARM_THM_MOVW_ABS_NC 47
435-
#define R_ARM_THM_MOVT_ABS 48
436-
#define R_ARM_THM_MOVW_PREL_NC 49
437-
#define R_ARM_THM_MOVT_PREL 50
438410
/** @endcond */
439411

440412
/**

0 commit comments

Comments
 (0)