diff options
author | Ulrich Drepper <drepper@gmail.com> | 2011-09-09 18:21:39 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-09 18:21:39 -0400 |
commit | e4899e7b9adbf74145f6530f6f57517f773e330c (patch) | |
tree | f8cc421a27739d5e2775478cac6707bd414949d1 /elf/elf.h | |
parent | f22e10748fbabbf07161eb7a5540b8c0e18553c4 (diff) | |
parent | 0a2349f929e937fb335ba53e217c05f5aa5d66d5 (diff) | |
download | glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.zip glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.gz glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.bz2 |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'elf/elf.h')
-rw-r--r-- | elf/elf.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -142,7 +142,8 @@ typedef struct #define ELFOSABI_SYSV 0 /* Alias. */ #define ELFOSABI_HPUX 1 /* HP-UX */ #define ELFOSABI_NETBSD 2 /* NetBSD. */ -#define ELFOSABI_LINUX 3 /* Linux. */ +#define ELFOSABI_GNU 3 /* Object uses GNU ELF extensions. */ +#define ELFOSABI_LINUX ELFOSABI_GNU /* Compatibility alias. */ #define ELFOSABI_SOLARIS 6 /* Sun Solaris. */ #define ELFOSABI_AIX 7 /* IBM AIX. */ #define ELFOSABI_IRIX 8 /* SGI Irix. */ |