Include config

tyfkda · Apr 26, 2024 · e66db13 · e66db13
1 parent 0f6702a
commit e66db13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ld/ld.c b/src/ld/ld.c
@@ -1,3 +1,5 @@
+#include "../config.h"
+
 #include <ar.h>
 #include <assert.h>
 #include <fcntl.h>

diff --git a/src/util/elfutil.c b/src/util/elfutil.c
@@ -84,11 +84,11 @@ void out_elf_header(FILE *fp, uintptr_t entry, int phnum, int shnum, int flags)
     .e_shoff     = 0, // dummy
     .e_flags     = flags,
     .e_ehsize    = sizeof(Elf64_Ehdr),
-    .e_phentsize = phnum > 0 ? sizeof(Elf64_Phdr) : 0,
+    .e_phentsize = sizeof(Elf64_Phdr),
     .e_phnum     = phnum,
-    .e_shentsize = shnum > 0 ? sizeof(Elf64_Shdr) : 0,
+    .e_shentsize = sizeof(Elf64_Shdr),
     .e_shnum     = shnum,
-    .e_shstrndx  = shnum > 0 ? shnum - 1 : 0,
+    .e_shstrndx  = shnum > 0 ? shnum - 1 : SHN_UNDEF,
   };
 
   fwrite(&ehdr, sizeof(Elf64_Ehdr), 1, fp);