summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-01-29 17:09:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-29 17:09:13 -0800
commit278c059663298a88e191a4372862f2ee0b1e3c3c (patch)
tree1a0ec42c79eb936d20e51f956c4005c2a4ad1a83 /libc
parentd9397a7c5e4efe4f74479afe75fd83db0bf59b86 (diff)
parent9d995d67217e44e022c9e5d0767634fa81f87b78 (diff)
downloadbionic-278c059663298a88e191a4372862f2ee0b1e3c3c.zip
bionic-278c059663298a88e191a4372862f2ee0b1e3c3c.tar.gz
bionic-278c059663298a88e191a4372862f2ee0b1e3c3c.tar.bz2
am 9d995d67: am 1cc09402: am f6721978: Merge "Fix x86 build to use <elf.h>."
# Via Android Git Automerger (2) and others * commit '9d995d67217e44e022c9e5d0767634fa81f87b78': Fix x86 build to use <elf.h>.
Diffstat (limited to 'libc')
-rw-r--r--libc/bionic/dl_iterate_phdr_static.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/dl_iterate_phdr_static.c b/libc/bionic/dl_iterate_phdr_static.c
index b8ef9e9..90ed1b7 100644
--- a/libc/bionic/dl_iterate_phdr_static.c
+++ b/libc/bionic/dl_iterate_phdr_static.c
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
+#include <elf.h>
#include <sys/types.h>
-#include <linux/elf.h>
#include <link.h>
/* Dynamic binaries get this from the dynamic linker (system/linker), which