diff options
author | John Reiser <jreiser@BitWagon.com> | 2010-10-27 06:59:07 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-10-29 14:08:54 -0400 |
commit | a2d49358ba9bc93204dc001d5568c5bdb299b77d (patch) | |
tree | a9f70362c6aba75f56ad4a808473ae961cff957b /scripts/recordmcount.c | |
parent | 949e51bea342da838be5295628e4a7ada8bae833 (diff) |
ftrace/MIPS: Add MIPS64 support for C version of recordmcount
MIPS64 has 'weird' Elf64_Rel.r_info[1,2], which must be used instead of
the generic Elf64_Rel.r_info, otherwise, the C version of recordmcount
will not work for "segmentation fault".
Usage of "union mips_r_info" and the functions MIPS64_r_sym() and
MIPS64_r_info() written by Maciej W. Rozycki <macro@linux-mips.org>
----
[1] http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
[2] arch/mips/include/asm/module.h
Tested-by: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: John Reiser <jreiser@BitWagon.com>
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
LKML-Reference: <AANLkTinwXjLAYACUfhLYaocHD_vBbiErLN3NjwN8JqSy@mail.gmail.com>
LKML-Reference: <910dc2d5ae1ed042df4f96815fe4a433078d1c2a.1288176026.git.wuzhangjin@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'scripts/recordmcount.c')
-rw-r--r-- | scripts/recordmcount.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 26e1271259ba..2d32b9ced20a 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c | |||
@@ -217,6 +217,39 @@ is_mcounted_section_name(char const *const txtname) | |||
217 | #define RECORD_MCOUNT_64 | 217 | #define RECORD_MCOUNT_64 |
218 | #include "recordmcount.h" | 218 | #include "recordmcount.h" |
219 | 219 | ||
220 | /* 64-bit EM_MIPS has weird ELF64_Rela.r_info. | ||
221 | * http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf | ||
222 | * We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40] | ||
223 | * to imply the order of the members; the spec does not say so. | ||
224 | * typedef unsigned char Elf64_Byte; | ||
225 | * fails on MIPS64 because their <elf.h> already has it! | ||
226 | */ | ||
227 | |||
228 | typedef uint8_t myElf64_Byte; /* Type for a 8-bit quantity. */ | ||
229 | |||
230 | union mips_r_info { | ||
231 | Elf64_Xword r_info; | ||
232 | struct { | ||
233 | Elf64_Word r_sym; /* Symbol index. */ | ||
234 | myElf64_Byte r_ssym; /* Special symbol. */ | ||
235 | myElf64_Byte r_type3; /* Third relocation. */ | ||
236 | myElf64_Byte r_type2; /* Second relocation. */ | ||
237 | myElf64_Byte r_type; /* First relocation. */ | ||
238 | } r_mips; | ||
239 | }; | ||
240 | |||
241 | static uint64_t MIPS64_r_sym(Elf64_Rel const *rp) | ||
242 | { | ||
243 | return w(((union mips_r_info){ .r_info = rp->r_info }).r_mips.r_sym); | ||
244 | } | ||
245 | |||
246 | static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type) | ||
247 | { | ||
248 | rp->r_info = ((union mips_r_info){ | ||
249 | .r_mips = { .r_sym = w(sym), .r_type = type } | ||
250 | }).r_info; | ||
251 | } | ||
252 | |||
220 | static void | 253 | static void |
221 | do_file(char const *const fname) | 254 | do_file(char const *const fname) |
222 | { | 255 | { |
@@ -268,6 +301,7 @@ do_file(char const *const fname) | |||
268 | case EM_386: reltype = R_386_32; break; | 301 | case EM_386: reltype = R_386_32; break; |
269 | case EM_ARM: reltype = R_ARM_ABS32; break; | 302 | case EM_ARM: reltype = R_ARM_ABS32; break; |
270 | case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break; | 303 | case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break; |
304 | case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break; | ||
271 | case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break; | 305 | case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break; |
272 | case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break; | 306 | case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break; |
273 | case EM_S390: /* reltype: e_class */ gpfx = '_'; break; | 307 | case EM_S390: /* reltype: e_class */ gpfx = '_'; break; |
@@ -291,6 +325,8 @@ do_file(char const *const fname) | |||
291 | } | 325 | } |
292 | if (EM_S390 == w2(ehdr->e_machine)) | 326 | if (EM_S390 == w2(ehdr->e_machine)) |
293 | reltype = R_390_32; | 327 | reltype = R_390_32; |
328 | if (EM_MIPS == w2(ehdr->e_machine)) | ||
329 | reltype = R_MIPS_32; | ||
294 | do32(ehdr, fname, reltype); | 330 | do32(ehdr, fname, reltype); |
295 | } break; | 331 | } break; |
296 | case ELFCLASS64: { | 332 | case ELFCLASS64: { |
@@ -303,6 +339,11 @@ do_file(char const *const fname) | |||
303 | } | 339 | } |
304 | if (EM_S390 == w2(ghdr->e_machine)) | 340 | if (EM_S390 == w2(ghdr->e_machine)) |
305 | reltype = R_390_64; | 341 | reltype = R_390_64; |
342 | if (EM_MIPS == w2(ghdr->e_machine)) { | ||
343 | reltype = R_MIPS_64; | ||
344 | Elf64_r_sym = MIPS64_r_sym; | ||
345 | Elf64_r_info = MIPS64_r_info; | ||
346 | } | ||
306 | do64(ghdr, fname, reltype); | 347 | do64(ghdr, fname, reltype); |
307 | } break; | 348 | } break; |
308 | } /* end switch */ | 349 | } /* end switch */ |