diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-06-14 18:02:13 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-14 18:02:13 +0900 |
| commit | 9a9fcfa04e86d26dd6129eb08165b696d602a118 (patch) | |
| tree | b7fcc86203cf7963ff9aa1ef1d2f3dabd19b5b31 | |
| parent | sh: kprobes SMP support. (diff) | |
| download | linux-dev-9a9fcfa04e86d26dd6129eb08165b696d602a118.tar.xz linux-dev-9a9fcfa04e86d26dd6129eb08165b696d602a118.zip | |
sh: update the FDPIC relocations.
Now that the FDPIC relocations have been given fixed numbers upstream,
switch to using those. The previous values only applied to experimental
toolchains that never made it in to the wild, so the impact remains
minimal.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/include/asm/elf.h | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index ce830faeebbf..f38112be67d2 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h @@ -50,25 +50,14 @@ #define R_SH_GOTPC 167 /* FDPIC relocs */ -#define R_SH_GOT20 70 -#define R_SH_GOTOFF20 71 -#define R_SH_GOTFUNCDESC 72 -#define R_SH_GOTFUNCDESC20 73 -#define R_SH_GOTOFFFUNCDESC 74 -#define R_SH_GOTOFFFUNCDESC20 75 -#define R_SH_FUNCDESC 76 -#define R_SH_FUNCDESC_VALUE 77 - -#if 0 /* XXX - later .. */ -#define R_SH_GOT20 198 -#define R_SH_GOTOFF20 199 -#define R_SH_GOTFUNCDESC 200 -#define R_SH_GOTFUNCDESC20 201 -#define R_SH_GOTOFFFUNCDESC 202 -#define R_SH_GOTOFFFUNCDESC20 203 -#define R_SH_FUNCDESC 204 -#define R_SH_FUNCDESC_VALUE 205 -#endif +#define R_SH_GOT20 201 +#define R_SH_GOTOFF20 202 +#define R_SH_GOTFUNCDESC 203 +#define R_SH_GOTFUNCDESC20 204 +#define R_SH_GOTOFFFUNCDESC 205 +#define R_SH_GOTOFFFUNCDESC20 206 +#define R_SH_FUNCDESC 207 +#define R_SH_FUNCDESC_VALUE 208 /* SHmedia relocs */ #define R_SH_IMM_LOW16 246 |