From ca47b30c873c5b07e3c3b1a4be34d9618ce5d7fe Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 22 Feb 2000 19:56:41 +0000 Subject: [PATCH] Remove use of ELF_ST_OTHER. --- binutils/ChangeLog | 4 ++++ binutils/readelf.c | 10 ++++------ include/elf/ChangeLog | 6 ++++++ include/elf/common.h | 5 ++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index ac00cfc..7a8aa07 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2000-02-22 Nick Clifton + + * readelf.c (process_symbol_table): Remove use of ELF_ST_OTHER. + 2000-02-22 Ian Lance Taylor From Brad Lucier : diff --git a/binutils/readelf.c b/binutils/readelf.c index f766976..2c53b46 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -4180,9 +4180,9 @@ process_symbol_table (file) printf (_("\nSymbol table for image:\n")); if (is_32bit_elf) - printf (_(" Num Buc: Value Size Type Bind Vis Ot Ndx Name\n")); + printf (_(" Num Buc: Value Size Type Bind Vis Ndx Name\n")); else - printf (_(" Num Buc: Value Size Type Bind Vis Ot Ndx Name\n")); + printf (_(" Num Buc: Value Size Type Bind Vis Ndx Name\n")); for (hn = 0; hn < nbuckets; hn++) { @@ -4203,7 +4203,6 @@ process_symbol_table (file) printf (" %6s", get_symbol_type (ELF_ST_TYPE (psym->st_info))); printf (" %6s", get_symbol_binding (ELF_ST_BIND (psym->st_info))); printf (" %3s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other))); - printf (" %2d", ELF_ST_OTHER (psym->st_other)); printf (" %3.3s", get_symbol_index_type (psym->st_shndx)); printf (" %s\n", dynamic_strings + psym->st_name); } @@ -4231,9 +4230,9 @@ process_symbol_table (file) SECTION_NAME (section), (unsigned long) (section->sh_size / section->sh_entsize)); if (is_32bit_elf) - printf (_(" Num: Value Size Type Bind Vis Ot Ndx Name\n")); + printf (_(" Num: Value Size Type Bind Vis Ndx Name\n")); else - printf (_(" Num: Value Size Type Bind Vis Ot Ndx Name\n")); + printf (_(" Num: Value Size Type Bind Vis Ndx Name\n")); symtab = GET_ELF_SYMBOLS (file, section->sh_offset, section->sh_size / section->sh_entsize); @@ -4263,7 +4262,6 @@ process_symbol_table (file) printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info))); printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info))); printf (" %-3s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other))); - printf (" %2d", ELF_ST_OTHER (psym->st_other)); printf (" %4s", get_symbol_index_type (psym->st_shndx)); printf (" %s", strtab + psym->st_name); diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 04b38e1..54df0cf 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,9 @@ +2000-02-22 Nick Clifton + + * common.h (ELF_ST_OTHER): Remove definition. + (ELF32_ST_OTHER): Remove definition. + (ELF64_ST_OTHER): Remove definition. + 2000-02-22 H.J. Lu * common.h (ELFOSABI_LINUX): Define. diff --git a/include/elf/common.h b/include/elf/common.h index 74fd7b2..0ff2d8d 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -317,12 +317,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ the st_other field. The STV_ defines specificy the actual visibility. */ #define ELF_ST_VISIBILITY(v) ((v) & 0x3) -#define ELF_ST_OTHER(o) ((o) & ~0x3) +/* The remaining bits in the st_other field are not currently used. + They should be set to zero. */ #define ELF32_ST_VISIBILITY ELF_ST_VISIBILITY -#define ELF32_ST_OTHER ELF_ST_OTHER #define ELF64_ST_VISIBILITY ELF_ST_VISIBILITY -#define ELF64_ST_OTHER ELF_ST_OTHER #define STN_UNDEF 0 /* undefined symbol index */ -- 2.7.4