ELF: Make first PT_LOAD cover headers

This makes it so that the first PT_LOAD segment covers
ELF and program header and .interp (contained in the same page anyway,
right before the start of the first loaded section).  binutils
strip creates invalid output otherwise (which strictly is a binutils
bug, but let's be nice anyway).

1 files changed, 10 insertions, 5 deletions

diff --git a/tccelf.c b/tccelf.c
index 7544d2e..f92021c 100644
--- a/tccelf.c
+++ b/tccelf.c
@@ -1538,10 +1538,6 @@ static void tcc_output_binary(TCCState *s1, FILE *f,
     }
 }
 
-// making this evaluate to true  allow valgrind to work on linux
-// but when compiled with debug info and then striped 
-// the compiled programs segfault
-// more tought must be applyed here
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #define HAVE_PHDR       1
 #define EXTRA_RELITEMS  14
@@ -1562,7 +1558,7 @@ void patch_dynsym_undef(TCCState *s1, Section *s)
     }
 }
 #else
-#define HAVE_PHDR      0
+#define HAVE_PHDR      1
 #define EXTRA_RELITEMS 9
 
 /* zero plt offsets of weak symbols in .dynsym */
@@ -1969,6 +1965,15 @@ static int layout_sections(TCCState *s1, ElfW(Phdr) *phdr, int phnum,
                         file_offset += s->sh_size;
                 }
             }
+	    if (j == 0) {
+		/* Make the first PT_LOAD segment include the program
+		   headers itself (and the ELF header as well), it'll
+		   come out with same memory use but will make various
+		   tools like binutils strip work better.  */
+		ph->p_offset &= ~(ph->p_align - 1);
+		ph->p_vaddr &= ~(ph->p_align - 1);
+		ph->p_paddr &= ~(ph->p_align - 1);
+	    }
             ph->p_filesz = file_offset - ph->p_offset;
             ph->p_memsz = addr - ph->p_vaddr;
             ph++;