소스 검색

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>
Paul Mundt 15 년 전
부모
커밋
9a9fcfa04e
1개의 변경된 파일8개의 추가작업 그리고 19개의 파일을 삭제
  1. 8 19
      arch/sh/include/asm/elf.h

+ 8 - 19
arch/sh/include/asm/elf.h

@@ -50,25 +50,14 @@
 #define	R_SH_GOTPC		167
 #define	R_SH_GOTPC		167
 
 
 /* FDPIC relocs */
 /* 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 */
 /* SHmedia relocs */
 #define R_SH_IMM_LOW16		246
 #define R_SH_IMM_LOW16		246