diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:26 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:26 +0000 |
| commit | ecbbb88727aee7880527d4b320b4d06dde75d46d (patch) | |
| tree | 67216fc12f1b8220039eed892403bfbde884a1a7 /arch/arm/include/asm/elf.h | |
| parent | 8cc9251737d1883e33fd0a7dafbd4062916c1ca6 (diff) | |
| parent | 2c736bb4087f2cb949cbbaf4148733131b8466dc (diff) | |
| download | linux-next-ecbbb88727aee7880527d4b320b4d06dde75d46d.tar.gz linux-next-ecbbb88727aee7880527d4b320b4d06dde75d46d.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/include/asm/elf.h')
| -rw-r--r-- | arch/arm/include/asm/elf.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index b078d992414b..0ac62a54b73c 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h @@ -51,6 +51,7 @@ typedef struct user_fp elf_fpregset_t; #define R_ARM_NONE 0 #define R_ARM_PC24 1 #define R_ARM_ABS32 2 +#define R_ARM_REL32 3 #define R_ARM_CALL 28 #define R_ARM_JUMP24 29 #define R_ARM_TARGET1 38 @@ -58,11 +59,15 @@ typedef struct user_fp elf_fpregset_t; #define R_ARM_PREL31 42 #define R_ARM_MOVW_ABS_NC 43 #define R_ARM_MOVT_ABS 44 +#define R_ARM_MOVW_PREL_NC 45 +#define R_ARM_MOVT_PREL 46 #define R_ARM_THM_CALL 10 #define R_ARM_THM_JUMP24 30 #define R_ARM_THM_MOVW_ABS_NC 47 #define R_ARM_THM_MOVT_ABS 48 +#define R_ARM_THM_MOVW_PREL_NC 49 +#define R_ARM_THM_MOVT_PREL 50 /* * These are used to set parameters in the core dumps. |