diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-06-05 14:33:56 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-06-05 14:33:56 +0800 |
commit | 92abac6a22ec444672d562ad63b750a6d79b2754 (patch) | |
tree | 2e9a93c268327ec3b6aad7d608c1d67acfc236d0 /scripts | |
parent | d4e491b1b01490f2745f139baf46aabf9951f6fd (diff) | |
parent | 694fe636bb23b9fe02e5ff3143ae46607c6a46af (diff) |
Merge branch 'v3.14/topic/arm64-ftrace' into linux-linaro-lsk-v3.14
Conflicts:
arch/arm64/Kconfig
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/recordmcount.c | 7 | ||||
-rwxr-xr-x | scripts/recordmcount.pl | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 9c22317778eb..e11aa4a156d2 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -40,6 +40,11 @@ #define R_METAG_NONE 3 #endif +#ifndef EM_AARCH64 +#define EM_AARCH64 183 +#define R_AARCH64_ABS64 257 +#endif + static int fd_map; /* File descriptor for file being modified. */ static int mmap_failed; /* Boolean flag. */ static void *ehdr_curr; /* current ElfXX_Ehdr * for resource cleanup */ @@ -347,6 +352,8 @@ do_file(char const *const fname) case EM_ARM: reltype = R_ARM_ABS32; altmcount = "__gnu_mcount_nc"; break; + case EM_AARCH64: + reltype = R_AARCH64_ABS64; gpfx = '_'; break; case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break; case EM_METAG: reltype = R_METAG_ADDR32; altmcount = "_mcount_wrapper"; diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 91280b82da08..397b6b84e8c5 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -279,6 +279,11 @@ if ($arch eq "x86_64") { $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_ARM_(CALL|PC24|THM_CALL)" . "\\s+(__gnu_mcount_nc|mcount)\$"; +} elsif ($arch eq "arm64") { + $alignment = 3; + $section_type = '%progbits'; + $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_AARCH64_CALL26\\s+_mcount\$"; + $type = ".quad"; } elsif ($arch eq "ia64") { $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; $type = "data8"; |