x86: merge elf_32/64.h