Merge branch 'master' into robustify

Conflicts:
	src/elflint.c

diff --cc src/ChangeLog
Simple merge

diff --cc src/elflint.c
index 6353ed45ec5335409882cf781913547931ae70dc,63d8389ecfb109c755ec3d39898caa37c305ed57..7b21f2b3b428600343a06289b890c25b2d5635db
--- 1/src/elflint.c
--- 2/src/elflint.c
+++ b/src/elflint.c
@@@ -130,9 -130,6 +130,10 @@@ static uint32_t shstrndx
  /* Array to count references in section groups.  */
  static int *scnref;
  
- /* Number of sections.  */
++/* Numbers of sections and program headers.  */
 +static unsigned int shnum;
++static unsigned int phnum;
 +
  
  int
  main (int argc, char *argv[])

diff --cc src/readelf.c
Simple merge