2 files changed, 370 insertions, 544 deletions

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 34f32be17090..7f7f7180fe24 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -212,550 +212,10 @@ is_mcounted_section_name(char const *const txtname)
                 0 == strcmp(".text.unlikely", txtname);
 }
 
-/* Append the new shstrtab, Elf32_Shdr[], __mcount_loc and its relocations. */
-static void append32(Elf32_Ehdr *const ehdr,
-                     Elf32_Shdr *const shstr,
-                     uint32_t const *const mloc0,
-                     uint32_t const *const mlocp,
-                     Elf32_Rel const *const mrel0,
-                     Elf32_Rel const *const mrelp,
-                     unsigned int const rel_entsize,
-                     unsigned int const symsec_sh_link)
-{
-        /* Begin constructing output file */
-        Elf32_Shdr mcsec;
-        char const *mc_name = (sizeof(Elf32_Rela) == rel_entsize)
-                ? ".rela__mcount_loc"
-                :  ".rel__mcount_loc";
-        unsigned const old_shnum = w2(ehdr->e_shnum);
-        uint32_t const old_shoff = w(ehdr->e_shoff);
-        uint32_t const old_shstr_sh_size   = w(shstr->sh_size);
-        uint32_t const old_shstr_sh_offset = w(shstr->sh_offset);
-        uint32_t t = 1 + strlen(mc_name) + w(shstr->sh_size);
-        uint32_t new_e_shoff;
-
-        shstr->sh_size = w(t);
-        shstr->sh_offset = w(sb.st_size);
-        t += sb.st_size;
-        t += (3u & -t);  /* 4-byte align */
-        new_e_shoff = t;
-
-        /* body for new shstrtab */
-        ulseek(fd_map, sb.st_size, SEEK_SET);
-        uwrite(fd_map, old_shstr_sh_offset + (void *)ehdr, old_shstr_sh_size);
-        uwrite(fd_map, mc_name, 1 + strlen(mc_name));
-
-        /* old(modified) Elf32_Shdr table, 4-byte aligned */
-        ulseek(fd_map, t, SEEK_SET);
-        t += sizeof(Elf32_Shdr) * old_shnum;
-        uwrite(fd_map, old_shoff + (void *)ehdr,
-               sizeof(Elf32_Shdr) * old_shnum);
-
-        /* new sections __mcount_loc and .rel__mcount_loc */
-        t += 2*sizeof(mcsec);
-        mcsec.sh_name = w((sizeof(Elf32_Rela) == rel_entsize) + strlen(".rel")
-                + old_shstr_sh_size);
-        mcsec.sh_type = w(SHT_PROGBITS);
-        mcsec.sh_flags = w(SHF_ALLOC);
-        mcsec.sh_addr = 0;
-        mcsec.sh_offset = w(t);
-        mcsec.sh_size = w((void *)mlocp - (void *)mloc0);
-        mcsec.sh_link = 0;
-        mcsec.sh_info = 0;
-        mcsec.sh_addralign = w(4);
-        mcsec.sh_entsize = w(4);
-        uwrite(fd_map, &mcsec, sizeof(mcsec));
-
-        mcsec.sh_name = w(old_shstr_sh_size);
-        mcsec.sh_type = (sizeof(Elf32_Rela) == rel_entsize)
-                ? w(SHT_RELA)
-                : w(SHT_REL);
-        mcsec.sh_flags = 0;
-        mcsec.sh_addr = 0;
-        mcsec.sh_offset = w((void *)mlocp - (void *)mloc0 + t);
-        mcsec.sh_size   = w((void *)mrelp - (void *)mrel0);
-        mcsec.sh_link = w(symsec_sh_link);
-        mcsec.sh_info = w(old_shnum);
-        mcsec.sh_addralign = w(4);
-        mcsec.sh_entsize = w(rel_entsize);
-        uwrite(fd_map, &mcsec, sizeof(mcsec));
-
-        uwrite(fd_map, mloc0, (void *)mlocp - (void *)mloc0);
-        uwrite(fd_map, mrel0, (void *)mrelp - (void *)mrel0);
-
-        ehdr->e_shoff = w(new_e_shoff);
-        ehdr->e_shnum = w2(2 + w2(ehdr->e_shnum));  /* {.rel,}__mcount_loc */
-        ulseek(fd_map, 0, SEEK_SET);
-        uwrite(fd_map, ehdr, sizeof(*ehdr));
-}
-
-/*
- * append64 and append32 (and other analogous pairs) could be templated
- * using C++, but the complexity is high.  (For an example, look at p_elf.h
- * in the source for UPX, http://upx.sourceforge.net)  So: remember to make
- * the corresponding change in the routine for the other size.
- */
-static void append64(Elf64_Ehdr *const ehdr,
-                     Elf64_Shdr *const shstr,
-                     uint64_t const *const mloc0,
-                     uint64_t const *const mlocp,
-                     Elf64_Rel const *const mrel0,
-                     Elf64_Rel const *const mrelp,
-                     unsigned int const rel_entsize,
-                     unsigned int const symsec_sh_link)
-{
-        /* Begin constructing output file */
-        Elf64_Shdr mcsec;
-        char const *mc_name = (sizeof(Elf64_Rela) == rel_entsize)
-                ? ".rela__mcount_loc"
-                :  ".rel__mcount_loc";
-        unsigned const old_shnum = w2(ehdr->e_shnum);
-        uint64_t const old_shoff = w8(ehdr->e_shoff);
-        uint64_t const old_shstr_sh_size   = w8(shstr->sh_size);
-        uint64_t const old_shstr_sh_offset = w8(shstr->sh_offset);
-        uint64_t t = 1 + strlen(mc_name) + w8(shstr->sh_size);
-        uint64_t new_e_shoff;
-
-        shstr->sh_size = w8(t);
-        shstr->sh_offset = w8(sb.st_size);
-        t += sb.st_size;
-        t += (7u & -t);  /* 8-byte align */
-        new_e_shoff = t;
-
-        /* body for new shstrtab */
-        ulseek(fd_map, sb.st_size, SEEK_SET);
-        uwrite(fd_map, old_shstr_sh_offset + (void *)ehdr, old_shstr_sh_size);
-        uwrite(fd_map, mc_name, 1 + strlen(mc_name));
-
-        /* old(modified) Elf64_Shdr table, 8-byte aligned */
-        ulseek(fd_map, t, SEEK_SET);
-        t += sizeof(Elf64_Shdr) * old_shnum;
-        uwrite(fd_map, old_shoff + (void *)ehdr,
-                sizeof(Elf64_Shdr) * old_shnum);
-
-        /* new sections __mcount_loc and .rel__mcount_loc */
-        t += 2*sizeof(mcsec);
-        mcsec.sh_name = w((sizeof(Elf64_Rela) == rel_entsize) + strlen(".rel")
-                + old_shstr_sh_size);
-        mcsec.sh_type = w(SHT_PROGBITS);
-        mcsec.sh_flags = w8(SHF_ALLOC);
-        mcsec.sh_addr = 0;
-        mcsec.sh_offset = w8(t);
-        mcsec.sh_size = w8((void *)mlocp - (void *)mloc0);
-        mcsec.sh_link = 0;
-        mcsec.sh_info = 0;
-        mcsec.sh_addralign = w8(8);
-        mcsec.sh_entsize = w8(8);
-        uwrite(fd_map, &mcsec, sizeof(mcsec));
-
-        mcsec.sh_name = w(old_shstr_sh_size);
-        mcsec.sh_type = (sizeof(Elf64_Rela) == rel_entsize)
-                ? w(SHT_RELA)
-                : w(SHT_REL);
-        mcsec.sh_flags = 0;
-        mcsec.sh_addr = 0;
-        mcsec.sh_offset = w8((void *)mlocp - (void *)mloc0 + t);
-        mcsec.sh_size   = w8((void *)mrelp - (void *)mrel0);
-        mcsec.sh_link = w(symsec_sh_link);
-        mcsec.sh_info = w(old_shnum);
-        mcsec.sh_addralign = w8(8);
-        mcsec.sh_entsize = w8(rel_entsize);
-        uwrite(fd_map, &mcsec, sizeof(mcsec));
-
-        uwrite(fd_map, mloc0, (void *)mlocp - (void *)mloc0);
-        uwrite(fd_map, mrel0, (void *)mrelp - (void *)mrel0);
-
-        ehdr->e_shoff = w8(new_e_shoff);
-        ehdr->e_shnum = w2(2 + w2(ehdr->e_shnum));  /* {.rel,}__mcount_loc */
-        ulseek(fd_map, 0, SEEK_SET);
-        uwrite(fd_map, ehdr, sizeof(*ehdr));
-}
-
-/*
- * Look at the relocations in order to find the calls to mcount.
- * Accumulate the section offsets that are found, and their relocation info,
- * onto the end of the existing arrays.
- */
-static uint32_t *sift32_rel_mcount(uint32_t *mlocp,
-                                   unsigned const offbase,
-                                   Elf32_Rel **const mrelpp,
-                                   Elf32_Shdr const *const relhdr,
-                                   Elf32_Ehdr const *const ehdr,
-                                   unsigned const recsym,
-                                   uint32_t const recval,
-                                   unsigned const reltype)
-{
-        uint32_t *const mloc0 = mlocp;
-        Elf32_Rel *mrelp = *mrelpp;
-        Elf32_Shdr *const shdr0 = (Elf32_Shdr *)(w(ehdr->e_shoff)
-                + (void *)ehdr);
-        unsigned const symsec_sh_link = w(relhdr->sh_link);
-        Elf32_Shdr const *const symsec = &shdr0[symsec_sh_link];
-        Elf32_Sym const *const sym0 = (Elf32_Sym const *)(w(symsec->sh_offset)
-                + (void *)ehdr);
-
-        Elf32_Shdr const *const strsec = &shdr0[w(symsec->sh_link)];
-        char const *const str0 = (char const *)(w(strsec->sh_offset)
-                + (void *)ehdr);
+/* 32 bit and 64 bit are very similar */
+#include "recordmcount.h"
+#define RECORD_MCOUNT_64
+#include "recordmcount.h"