diff options
author | Roland McGrath <roland@redhat.com> | 2010-05-20 17:04:15 -0700 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 2010-05-20 17:04:15 -0700 |
commit | 844f20f64770e9ed4177aa7285c9b96a11ec7547 (patch) | |
tree | 38c73449e465eade3d36f891b9c5db2bee0e4c3b /libelf/libelf.map | |
parent | fb65cc365e5d51f2434128467dab554f6921727b (diff) | |
parent | a0635db0fbe13ad7b531ee99eeb063a8eded923c (diff) | |
download | elfutils-844f20f64770e9ed4177aa7285c9b96a11ec7547.tar.gz |
Merge branch 'master' into roland/notes
Conflicts:
libdw/libdw.map
libdwfl/Makefile.am
libdwfl/argp-std.c
libdwfl/core-file.c
libdwfl/libdwfl.h
libdwfl/libdwflP.h
libdwfl/linux-proc-maps.c
libelf/Makefile.am
libelf/common.h
libelf/elf_begin.c
libelf/elf_readall.c
libelf/libelf.map
libelf/libelfP.h
tests/Makefile.am
Diffstat (limited to 'libelf/libelf.map')
-rw-r--r-- | libelf/libelf.map | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libelf/libelf.map b/libelf/libelf.map index ec149b43..9ee91127 100644 --- a/libelf/libelf.map +++ b/libelf/libelf.map @@ -122,7 +122,25 @@ ELFUTILS_1.3 { gelf_getauxv; gelf_update_auxv; gelf_getnote; +} ELFUTILS_1.2; + +ELFUTILS_1.4 { + global: + elf_scnshndx; +} ELFUTILS_1.3; + +ELFUTILS_1.5 { + global: + elf_getshdrnum; elf_getshdrstrndx; +} ELFUTILS_1.4; + +ELFUTILS_1.6 { + global: + elf_getphdrnum; +} ELFUTILS_1.5; + +ELFUTILS_XXX { gelf_getdata_memory; gelf_getdata_rawchunk; gelf_begin_embedded; -}; +} ELFUTILS_1.5; |