diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-30 01:50:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-30 01:50:16 +0000 |
| commit | 323287ea7fb1d22f64b49d701b33cef9fbaf757d (patch) | |
| tree | 6a43ffce4ef2904b88cf47262831102fefde3501 /libc | |
| parent | f67219783fa7c38c1f4f077364290d10d3aa1db4 (diff) | |
| parent | 6fe67c3cf26cc695881d7cb8a9aa971e4dab1f59 (diff) | |
| download | bionic-323287ea7fb1d22f64b49d701b33cef9fbaf757d.zip bionic-323287ea7fb1d22f64b49d701b33cef9fbaf757d.tar.gz bionic-323287ea7fb1d22f64b49d701b33cef9fbaf757d.tar.bz2 | |
Merge "Fix valgrind build."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/sys/exec_elf.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/include/sys/exec_elf.h b/libc/include/sys/exec_elf.h index 1cc64a4..6d445bf 100644 --- a/libc/include/sys/exec_elf.h +++ b/libc/include/sys/exec_elf.h @@ -700,6 +700,8 @@ typedef struct { Elf64_Xword a_v; /* 64-bit id */ } Aux64Info; +/* BEGIN android-changed: these constants should come from <linux/auxvec.h>. */ +#if 0 /* a_type */ #define AT_NULL 0 /* Marks end of array */ #define AT_IGNORE 1 /* No meaning, a_un is undefined */ @@ -740,6 +742,8 @@ typedef struct { #define AT_SUN_EMUL_EXECFD 2013 /* coff file descriptor */ /* Executable's fully resolved name */ #define AT_SUN_EXECNAME 2014 +#endif +/* END android-changed */ /* * Note Headers |