From: Roland McGrath <roland@redhat.com>
Date: Fri, 8 Jan 2010 04:34:08 +0000 (-0800)
Subject: Merge branch 'master' into robustify
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adb1139114f50faf9cbd38da9430234010838665;p=thirdparty%2Felfutils.git

Merge branch 'master' into robustify

Conflicts:
	src/elflint.c
---

adb1139114f50faf9cbd38da9430234010838665
diff --cc src/elflint.c
index 6353ed45e,63d8389ec..7b21f2b3b
--- a/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[])