mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-28 00:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add architecture flag to zipobj

Browse source
This commit is contained in:
Justine Tunney 2023-11-12 09:35:59 -08:00
parent bed77186c3
commit f25beb341c
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
5 changed files with 46 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tool/build/lib/elfwriter.c
View file

@ -156,7 +156,7 @@ static void FlushTables(struct ElfWriter *elf) {
elfwriter_commit(elf, size);
}
struct ElfWriter *elfwriter_open(const char *path, int mode) {
struct ElfWriter *elfwriter_open(const char *path, int mode, int arch) {
struct ElfWriter *elf;
CHECK_NOTNULL((elf = calloc(1, sizeof(struct ElfWriter))));
CHECK_NOTNULL((elf->path = strdup(path)));
@ -166,15 +166,22 @@ struct ElfWriter *elfwriter_open(const char *path, int mode) {
elf->mapsize, PROT_READ | PROT_WRITE,
MAP_SHARED | MAP_FIXED, elf->fd, 0)));
elf->ehdr = memcpy(elf->map, &kObjHeader, (elf->wrote = sizeof(kObjHeader)));
if (strstr(path, "/aarch64")) {
elf->ehdr->e_machine = EM_AARCH64;
} else if (strstr(path, "/powerpc64")) {
elf->ehdr->e_machine = EM_PPC64;
} else if (strstr(path, "/riscv")) {
elf->ehdr->e_machine = EM_RISCV;
} else if (strstr(path, "/s390")) {
if (!arch) {
#ifdef __x86_64__
arch = EM_NEXGEN32E;
#elif defined(__aarch64__)
arch = EM_AARCH64;
#elif defined(__powerpc64__)
arch = EM_PPC64;
#elif defined(__riscv)
arch = EM_RISCV;
#elif defined(__s390x__)
elf->ehdr->e_machine = EM_S390;
#else
#error "unsupported architecture"
#endif
}
elf->ehdr->e_machine = arch;
elf->strtab = newinterner();
elf->shstrtab = newinterner();
intern(elf->strtab, "");