diff options
author | Nick Clifton <nickc@redhat.com> | 2000-12-12 19:36:32 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2000-12-12 19:36:32 +0000 |
commit | 90248f40852c0916f4ac639440d307517d2b2d8e (patch) | |
tree | ca1dc5d39f25bce9acea774de26097fbdc0fcac2 | |
parent | 171592a6b71d305d09d394e1045090a95f46eaef (diff) | |
download | binutils-redhat-90248f40852c0916f4ac639440d307517d2b2d8e.tar.gz |
Fix formatting.
-rw-r--r-- | bfd/ChangeLog | 8 | ||||
-rw-r--r-- | bfd/cpu-sh.c | 12 | ||||
-rw-r--r-- | bfd/elf.c | 4 | ||||
-rw-r--r-- | bfd/elf32-mips.c | 61 | ||||
-rw-r--r-- | bfd/elf32-sh.c | 46 | ||||
-rw-r--r-- | bfd/elf64-alpha.c | 4 | ||||
-rw-r--r-- | binutils/ChangeLog | 4 | ||||
-rw-r--r-- | binutils/po/binutils.pot | 613 | ||||
-rw-r--r-- | binutils/readelf.c | 148 | ||||
-rw-r--r-- | gas/ChangeLog | 3 | ||||
-rw-r--r-- | gas/doc/c-mips.texi | 36 |
11 files changed, 498 insertions, 441 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 568f2c79c4..6c8ce49829 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2000-12-12 Nick Clifton <nickc@redhat.com> + + * cpu-sh.c: Fix formattng. + * elf.c: Fix formattng. + * elf32-mips.c: Fix formattng. + * elf32-sh.c: Fix formattng. + * elf64-alpha.c: Fix formattng. + 2000-12-09 Nick Clifton <nickc@redhat.com> * elf32-mips.c (_bfd_mips_elf_find_nearest_line): Pass diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c index 64b8e7c2c3..3b903eb53c 100644 --- a/bfd/cpu-sh.c +++ b/bfd/cpu-sh.c @@ -47,13 +47,13 @@ compatible (a,b) } #endif -#define SH_NEXT &arch_info_struct[0] -#define SH2_NEXT &arch_info_struct[1] -#define SH_DSP_NEXT &arch_info_struct[2] -#define SH3_NEXT &arch_info_struct[3] +#define SH_NEXT &arch_info_struct[0] +#define SH2_NEXT &arch_info_struct[1] +#define SH_DSP_NEXT &arch_info_struct[2] +#define SH3_NEXT &arch_info_struct[3] #define SH3_DSP_NEXT &arch_info_struct[4] -#define SH3E_NEXT &arch_info_struct[5] -#define SH4_NEXT NULL +#define SH3E_NEXT &arch_info_struct[5] +#define SH4_NEXT NULL static const bfd_arch_info_type arch_info_struct[] = { @@ -3307,9 +3307,9 @@ prep_headers (abfd) break; case bfd_arch_i386: if (bfd_get_arch_size (abfd) == 64) - i_ehdrp->e_machine = EM_X86_64; + i_ehdrp->e_machine = EM_X86_64; else - i_ehdrp->e_machine = EM_386; + i_ehdrp->e_machine = EM_386; break; case bfd_arch_ia64: i_ehdrp->e_machine = EM_IA_64; diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c index dd3ee184d6..5bb1e94c2e 100644 --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -49,7 +49,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This structure is used to hold .got information when linking. It is stored in the tdata field of the bfd_elf_section_data structure. */ -struct mips_got_info { +struct mips_got_info +{ /* The global symbol in the GOT with the lowest index in the dynamic symbol table. */ struct elf_link_hash_entry *global_gotsym; @@ -64,7 +65,8 @@ struct mips_got_info { /* The MIPS ELF linker needs additional information for each symbol in the global hash table. */ -struct mips_elf_link_hash_entry { +struct mips_elf_link_hash_entry +{ struct elf_link_hash_entry root; /* External symbol information. */ @@ -321,7 +323,8 @@ static bfd *reldyn_sorting_bfd; /* Names of sections which appear in the .dynsym section in an Irix 5 executable. */ -static const char * const mips_elf_dynsym_sec_names[] = { +static const char * const mips_elf_dynsym_sec_names[] = +{ ".text", ".init", ".fini", @@ -345,7 +348,8 @@ static const char * const mips_elf_dynsym_sec_names[] = { /* The names of the runtime procedure table symbols used on Irix 5. */ -static const char * const mips_elf_dynsym_rtproc_names[] = { +static const char * const mips_elf_dynsym_rtproc_names[] = +{ "_procedure_table", "_procedure_string_table", "_procedure_table_size", @@ -355,7 +359,8 @@ static const char * const mips_elf_dynsym_rtproc_names[] = { /* These structures are used to generate the .compact_rel section on Irix 5. */ -typedef struct { +typedef struct +{ unsigned long id1; /* Always one? */ unsigned long num; /* Number of compact relocation entries. */ unsigned long id2; /* Always two? */ @@ -364,7 +369,8 @@ typedef struct { unsigned long reserved1; /* Zero? */ } Elf32_compact_rel; -typedef struct { +typedef struct +{ bfd_byte id1[4]; bfd_byte num[4]; bfd_byte id2[4]; @@ -373,7 +379,8 @@ typedef struct { bfd_byte reserved1[4]; } Elf32_External_compact_rel; -typedef struct { +typedef struct +{ unsigned int ctype : 1; /* 1: long 0: short format. See below. */ unsigned int rtype : 4; /* Relocation types. See below. */ unsigned int dist2to : 8; @@ -382,7 +389,8 @@ typedef struct { unsigned long vaddr; /* VADDR to be relocated. */ } Elf32_crinfo; -typedef struct { +typedef struct +{ unsigned int ctype : 1; /* 1: long 0: short format. See below. */ unsigned int rtype : 4; /* Relocation types. See below. */ unsigned int dist2to : 8; @@ -390,13 +398,15 @@ typedef struct { unsigned long konst; /* KONST field. See below. */ } Elf32_crinfo2; -typedef struct { +typedef struct +{ bfd_byte info[4]; bfd_byte konst[4]; bfd_byte vaddr[4]; } Elf32_External_crinfo; -typedef struct { +typedef struct +{ bfd_byte info[4]; bfd_byte konst[4]; } Elf32_External_crinfo2; @@ -449,7 +459,8 @@ static void bfd_elf32_swap_crinfo_out from smaller values. Start with zero, widen, *then* decrement. */ #define MINUS_ONE (((bfd_vma)0) - 1) -static reloc_howto_type elf_mips_howto_table[] = { +static reloc_howto_type elf_mips_howto_table[] = +{ /* No relocation. */ HOWTO (R_MIPS_NONE, /* type */ 0, /* rightshift */ @@ -1067,7 +1078,8 @@ static reloc_howto_type elf_mips_gnu_vtentry_howto = reloc. This extension permits gcc to output the HI and LO relocs itself. */ -struct mips_hi16 { +struct mips_hi16 +{ struct mips_hi16 *next; bfd_byte *addr; bfd_vma addend; @@ -1924,7 +1936,8 @@ struct elf_reloc_map { enum elf_mips_reloc_type elf_reloc_val; }; -static CONST struct elf_reloc_map mips_reloc_map[] = { +static CONST struct elf_reloc_map mips_reloc_map[] = +{ { BFD_RELOC_NONE, R_MIPS_NONE, }, { BFD_RELOC_16, R_MIPS_16 }, { BFD_RELOC_32, R_MIPS_32 }, @@ -3491,7 +3504,8 @@ _bfd_mips_elf_modify_segment_map (abfd) if (m != NULL && m->count == 1 && strcmp (m->sections[0]->name, ".dynamic") == 0) { - static const char *sec_names[] = { + static const char *sec_names[] = + { ".dynamic", ".dynstr", ".dynsym", ".hash" }; bfd_vma low, high; @@ -3710,7 +3724,8 @@ mips_elf_is_local_label_name (abfd, name) /* MIPS ELF uses a special find_nearest_line routine in order the handle the ECOFF debugging information. */ -struct mips_elf_find_line { +struct mips_elf_find_line +{ struct ecoff_debug_info d; struct ecoff_find_line i; }; @@ -3863,7 +3878,8 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr, /* MIPS ELF linker hash table. */ -struct mips_elf_link_hash_table { +struct mips_elf_link_hash_table +{ struct elf_link_hash_table root; #if 0 /* We no longer use this. */ @@ -4157,7 +4173,8 @@ _bfd_mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) /* Structure used to pass information to mips_elf_output_extsym. */ -struct extsym_info { +struct extsym_info +{ bfd *abfd; struct bfd_link_info *info; struct ecoff_debug_info *debug; @@ -4532,11 +4549,13 @@ _bfd_mips_elf_final_link (abfd, info) EXTR esym; bfd_vma last; unsigned int i; - static const char * const name[] = { + static const char * const name[] = + { ".text", ".init", ".fini", ".data", ".rodata", ".sdata", ".sbss", ".bss" }; - static const int sc[] = { + static const int sc[] = + { scText, scInit, scFini, scData, scRData, scSData, scSBss, scBss }; @@ -5455,7 +5474,8 @@ mips_elf_record_global_got_symbol (h, info, g) /* This structure is passed to mips_elf_sort_hash_table_f when sorting the dynamic symbols. */ -struct mips_elf_hash_sort_data { +struct mips_elf_hash_sort_data +{ /* The symbol in the global GOT with the lowest dynamic symbol table index. */ struct elf_link_hash_entry *low; @@ -6610,7 +6630,6 @@ mips_elf_perform_relocation (info, howto, relocation, value, value = (((value & 0x1f0000) << 5) | ((value & 0x3e00000) >> 5) | (value & 0xffff)); - } else if (r_type == R_MIPS16_GPREL) { diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 61df1f7c4e..1648b71893 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -77,7 +77,8 @@ static boolean sh_elf_finish_dynamic_sections #define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1" -static reloc_howto_type sh_elf_howto_table[] = { +static reloc_howto_type sh_elf_howto_table[] = +{ /* No relocation. */ HOWTO (R_SH_NONE, /* type */ 0, /* rightshift */ @@ -911,14 +912,16 @@ sh_elf_ignore_reloc (abfd, reloc_entry, symbol, data, input_section, /* This structure is used to map BFD reloc codes to SH ELF relocs. */ -struct elf_reloc_map { +struct elf_reloc_map +{ bfd_reloc_code_real_type bfd_reloc_val; unsigned char elf_reloc_val; }; /* An array mapping BFD reloc codes to SH ELF relocs. */ -static const struct elf_reloc_map sh_reloc_map[] = { +static const struct elf_reloc_map sh_reloc_map[] = +{ { BFD_RELOC_NONE, R_SH_NONE }, { BFD_RELOC_32, R_SH_DIR32 }, { BFD_RELOC_CTOR, R_SH_DIR32 }, @@ -2087,7 +2090,8 @@ sh_elf_swap_insns (abfd, sec, relocs, contents, addr) /* First entry in an absolute procedure linkage table look like this. */ -static const bfd_byte elf_sh_plt0_entry_be[PLT_ENTRY_SIZE] = { +static const bfd_byte elf_sh_plt0_entry_be[PLT_ENTRY_SIZE] = +{ 0xd0, 0x04, /* mov.l 1f,r0 */ 0xd2, 0x05, /* mov.l 2f,r2 */ 0x60, 0x02, /* mov.l @r0,r0 */ @@ -2102,7 +2106,8 @@ static const bfd_byte elf_sh_plt0_entry_be[PLT_ENTRY_SIZE] = { 0, 0, 0, 0, /* 2: replaced with address of .got.plt + 4. */ }; -static const bfd_byte elf_sh_plt0_entry_le[PLT_ENTRY_SIZE] = { +static const bfd_byte elf_sh_plt0_entry_le[PLT_ENTRY_SIZE] = +{ 0x04, 0xd0, /* mov.l 1f,r0 */ 0x05, 0xd2, /* mov.l 2f,r2 */ 0x02, 0x60, /* mov.l @r0,r0 */ @@ -2120,7 +2125,8 @@ static const bfd_byte elf_sh_plt0_entry_le[PLT_ENTRY_SIZE] = { /* Sebsequent entries in an absolute procedure linkage table look like this. */ -static const bfd_byte elf_sh_plt_entry_be[PLT_ENTRY_SIZE] = { +static const bfd_byte elf_sh_plt_entry_be[PLT_ENTRY_SIZE] = +{ 0xd0, 0x04, /* mov.l 1f,r0 */ 0x60, 0x02, /* mov.l @r0,r0 */ 0xd2, 0x02, /* mov.l 0f,r2 */ @@ -2134,7 +2140,8 @@ static const bfd_byte elf_sh_plt_entry_be[PLT_ENTRY_SIZE] = { 0, 0, 0, 0, /* 2: replaced with offset into relocation table. */ }; -static const bfd_byte elf_sh_plt_entry_le[PLT_ENTRY_SIZE] = { +static const bfd_byte elf_sh_plt_entry_le[PLT_ENTRY_SIZE] = +{ 0x04, 0xd0, /* mov.l 1f,r0 */ 0x02, 0x60, /* mov.l @r0,r0 */ 0x02, 0xd2, /* mov.l 0f,r2 */ @@ -2150,7 +2157,8 @@ static const bfd_byte elf_sh_plt_entry_le[PLT_ENTRY_SIZE] = { /* Entries in a PIC procedure linkage table look like this. */ -static const bfd_byte elf_sh_pic_plt_entry_be[PLT_ENTRY_SIZE] = { +static const bfd_byte elf_sh_pic_plt_entry_be[PLT_ENTRY_SIZE] = +{ 0xd0, 0x04, /* mov.l 1f,r0 */ 0x00, 0xce, /* mov.l @(r0,r12),r0 */ 0x40, 0x2b, /* jmp @r0 */ @@ -2165,7 +2173,8 @@ static const bfd_byte elf_sh_pic_plt_entry_be[PLT_ENTRY_SIZE] = { 0, 0, 0, 0 /* 2: replaced with offset into relocation table. */ }; -static const bfd_byte elf_sh_pic_plt_entry_le[PLT_ENTRY_SIZE] = { +static const bfd_byte elf_sh_pic_plt_entry_le[PLT_ENTRY_SIZE] = +{ 0x04, 0xd0, /* mov.l 1f,r0 */ 0xce, 0x00, /* mov.l @(r0,r12),r0 */ 0x2b, 0x40, /* jmp @r0 */ @@ -2214,7 +2223,8 @@ static const bfd_byte *elf_sh_pic_plt_entry; /* This structure keeps track of the number of PC relative relocs we have copied for a given symbol. */ -struct elf_sh_pcrel_relocs_copied { +struct elf_sh_pcrel_relocs_copied +{ /* Next section. */ struct elf_sh_pcrel_relocs_copied *next; /* A section in dynobj. */ @@ -2225,7 +2235,8 @@ struct elf_sh_pcrel_relocs_copied { /* sh ELF linker hash entry. */ -struct elf_sh_link_hash_entry { +struct elf_sh_link_hash_entry +{ struct elf_link_hash_entry root; /* Number of PC relative relocs copied for this symbol. */ @@ -2234,7 +2245,8 @@ struct elf_sh_link_hash_entry { /* sh ELF linker hash table. */ -struct elf_sh_link_hash_table { +struct elf_sh_link_hash_table +{ struct elf_link_hash_table root; }; @@ -3524,9 +3536,7 @@ sh_elf_gc_mark_hook (abfd, info, rel, h, sym) && ELF_ST_BIND (sym->st_info) != STB_LOCAL) && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE) && sym->st_shndx != SHN_COMMON)) - { - return bfd_section_from_elf_index (abfd, sym->st_shndx); - } + return bfd_section_from_elf_index (abfd, sym->st_shndx); } return NULL; } @@ -3895,10 +3905,10 @@ sh_elf_set_private_flags (abfd, flags) static boolean sh_elf_copy_private_data (ibfd, obfd) - bfd *ibfd; - bfd *obfd; + bfd * ibfd; + bfd * obfd; { - if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour + if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) return true; diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index f355427f9b..ce63cc7d18 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -4741,9 +4741,7 @@ const struct elf_size_info alpha_elf_size_info = #define elf_backend_size_info \ alpha_elf_size_info -/* - * A few constants that determine how the .plt section is set up. - */ +/* A few constants that determine how the .plt section is set up. */ #define elf_backend_want_got_plt 0 #define elf_backend_plt_readonly 0 #define elf_backend_want_plt_sym 1 diff --git a/binutils/ChangeLog b/binutils/ChangeLog index b8cb43e554..e63cbc5303 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2000-12-12 Nick Clifton <nickc@redhat.com> + + * readelf.c: Fix formatting. + Mon Dec 11 14:30:21 MET 2000 Jan Hubicka <jh@suse.cz> * MAINTAINERS: Add myself and Andreas Jaeger as x86_64 maintainer. diff --git a/binutils/po/binutils.pot b/binutils/po/binutils.pot index 9664d25717..c7dfb676e4 100644 --- a/binutils/po/binutils.pot +++ b/binutils/po/binutils.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-12-01 13:19-0800\n" +"POT-Creation-Date: 2000-12-08 17:50-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -23,7 +23,7 @@ msgid "" msgstr "" #: addr2line.c:83 ar.c:288 nlmconv.c:1119 objcopy.c:373 objcopy.c:405 -#: readelf.c:1862 size.c:91 strings.c:530 windres.c:737 +#: readelf.c:1870 size.c:91 strings.c:530 windres.c:737 #, c-format msgid "Report bugs to %s\n" msgstr "" @@ -2054,926 +2054,926 @@ msgstr "" msgid " Offset Info Type Symbol's Value Symbol's Name\n" msgstr "" -#: readelf.c:900 readelf.c:902 +#: readelf.c:901 readelf.c:903 #, c-format msgid "unrecognised: %-7lx" msgstr "" -#: readelf.c:927 +#: readelf.c:928 #, c-format msgid "<string table index %3ld>" msgstr "" -#: readelf.c:1140 +#: readelf.c:1141 #, c-format msgid "Processor Specific: %lx" msgstr "" -#: readelf.c:1159 +#: readelf.c:1160 #, c-format msgid "Operating System specific: %lx" msgstr "" -#: readelf.c:1162 readelf.c:1663 +#: readelf.c:1163 readelf.c:1671 #, c-format msgid "<unknown>: %lx" msgstr "" -#: readelf.c:1176 +#: readelf.c:1177 msgid "NONE (None)" msgstr "" -#: readelf.c:1177 +#: readelf.c:1178 msgid "REL (Relocatable file)" msgstr "" -#: readelf.c:1178 +#: readelf.c:1179 msgid "EXEC (Executable file)" msgstr "" -#: readelf.c:1179 +#: readelf.c:1180 msgid "DYN (Shared object file)" msgstr "" -#: readelf.c:1180 +#: readelf.c:1181 msgid "CORE (Core file)" msgstr "" -#: readelf.c:1184 +#: readelf.c:1185 #, c-format msgid "Processor Specific: (%x)" msgstr "" -#: readelf.c:1186 +#: readelf.c:1187 #, c-format msgid "OS Specific: (%x)" msgstr "" -#: readelf.c:1188 readelf.c:1274 readelf.c:1797 +#: readelf.c:1189 readelf.c:1275 readelf.c:1805 #, c-format msgid "<unknown>: %x" msgstr "" -#: readelf.c:1201 +#: readelf.c:1202 msgid "None" msgstr "" -#: readelf.c:1835 +#: readelf.c:1843 msgid "Usage: readelf {options} elf-file(s)\n" msgstr "" -#: readelf.c:1836 +#: readelf.c:1844 msgid " Options are:\n" msgstr "" -#: readelf.c:1837 +#: readelf.c:1845 msgid " -a or --all Equivalent to: -h -l -S -s -r -d -V -A -I\n" msgstr "" -#: readelf.c:1838 +#: readelf.c:1846 msgid " -h or --file-header Display the ELF file header\n" msgstr "" -#: readelf.c:1839 +#: readelf.c:1847 msgid " -l or --program-headers or --segments\n" msgstr "" -#: readelf.c:1840 +#: readelf.c:1848 msgid " Display the program headers\n" msgstr "" -#: readelf.c:1841 +#: readelf.c:1849 msgid " -S or --section-headers or --sections\n" msgstr "" -#: readelf.c:1842 +#: readelf.c:1850 msgid " Display the sections' header\n" msgstr "" -#: readelf.c:1843 +#: readelf.c:1851 msgid " -e or --headers Equivalent to: -h -l -S\n" msgstr "" -#: readelf.c:1844 +#: readelf.c:1852 msgid " -s or --syms or --symbols Display the symbol table\n" msgstr "" -#: readelf.c:1845 +#: readelf.c:1853 msgid " -n or --notes Display the core notes (if present)\n" msgstr "" -#: readelf.c:1846 +#: readelf.c:1854 msgid " -r or --relocs Display the relocations (if present)\n" msgstr "" -#: readelf.c:1847 +#: readelf.c:1855 msgid " -d or --dynamic Display the dynamic segment (if present)\n" msgstr "" -#: readelf.c:1848 +#: readelf.c:1856 msgid " -V or --version-info Display the version sections (if present)\n" msgstr "" -#: readelf.c:1849 +#: readelf.c:1857 msgid "" " -A or --arch-specific Display architecture specific information (if " "any).\n" msgstr "" -#: readelf.c:1850 +#: readelf.c:1858 msgid "" " -D or --use-dynamic Use the dynamic section info when displaying " "symbols\n" msgstr "" -#: readelf.c:1851 +#: readelf.c:1859 msgid " -x <number> or --hex-dump=<number>\n" msgstr "" -#: readelf.c:1852 +#: readelf.c:1860 msgid " Dump the contents of section <number>\n" msgstr "" -#: readelf.c:1853 +#: readelf.c:1861 msgid "" " -w[liaprf] or --debug-dump[=line,=info,=abbrev,=pubnames,=ranges,=frames]\n" msgstr "" -#: readelf.c:1854 +#: readelf.c:1862 msgid "" " Display the contents of DWARF2 debug sections\n" msgstr "" -#: readelf.c:1856 +#: readelf.c:1864 msgid " -i <number> or --instruction-dump=<number>\n" msgstr "" -#: readelf.c:1857 +#: readelf.c:1865 msgid "" " Disassemble the contents of section <number>\n" msgstr "" -#: readelf.c:1859 +#: readelf.c:1867 msgid " -I or --histogram Display histogram of bucket list lengths\n" msgstr "" -#: readelf.c:1860 +#: readelf.c:1868 msgid " -v or --version Display the version number of readelf\n" msgstr "" -#: readelf.c:1861 +#: readelf.c:1869 msgid " -H or --help Display this information\n" msgstr "" -#: readelf.c:1879 +#: readelf.c:1887 msgid "Out of memory allocating dump request table." msgstr "" -#: readelf.c:2019 +#: readelf.c:2027 #, c-format msgid "Unrecognised debug option '%s'\n" msgstr "" -#: readelf.c:2044 +#: readelf.c:2052 #, c-format msgid "Invalid option '-%c'\n" msgstr "" -#: readelf.c:2057 +#: readelf.c:2065 msgid "Nothing to do.\n" msgstr "" -#: readelf.c:2070 readelf.c:2087 readelf.c:3722 +#: readelf.c:2078 readelf.c:2095 readelf.c:3734 msgid "none" msgstr "" -#: readelf.c:2071 +#: readelf.c:2079 msgid "ELF32" msgstr "" -#: readelf.c:2072 +#: readelf.c:2080 msgid "ELF64" msgstr "" -#: readelf.c:2074 readelf.c:2091 readelf.c:2119 +#: readelf.c:2082 readelf.c:2099 readelf.c:2127 #, c-format msgid "<unknown: %x>" msgstr "" -#: readelf.c:2088 +#: readelf.c:2096 msgid "2's complement, little endian" msgstr "" -#: readelf.c:2089 +#: readelf.c:2097 msgid "2's complement, big endian" msgstr "" -#: readelf.c:2104 +#: readelf.c:2112 msgid "UNIX - System V" msgstr "" -#: readelf.c:2105 +#: readelf.c:2113 msgid "UNIX - HP-UX" msgstr "" -#: readelf.c:2106 +#: readelf.c:2114 msgid "UNIX - NetBSD" msgstr "" -#: readelf.c:2107 +#: readelf.c:2115 msgid "UNIX - Linux" msgstr "" -#: readelf.c:2108 +#: readelf.c:2116 msgid "GNU/Hurd" msgstr "" -#: readelf.c:2109 +#: readelf.c:2117 msgid "UNIX - Solaris" msgstr "" -#: readelf.c:2110 +#: readelf.c:2118 msgid "UNIX - AIX" msgstr "" -#: readelf.c:2111 +#: readelf.c:2119 msgid "UNIX - IRIX" msgstr "" -#: readelf.c:2112 +#: readelf.c:2120 msgid "UNIX - FreeBSD" msgstr "" -#: readelf.c:2113 +#: readelf.c:2121 msgid "UNIX - TRU64" msgstr "" -#: readelf.c:2114 +#: readelf.c:2122 msgid "Novell - Modesto" msgstr "" -#: readelf.c:2115 +#: readelf.c:2123 msgid "UNIX - OpenBSD" msgstr "" -#: readelf.c:2116 +#: readelf.c:2124 msgid "Standalone App" msgstr "" -#: readelf.c:2117 +#: readelf.c:2125 msgid "ARM" msgstr "" -#: readelf.c:2134 +#: readelf.c:2142 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "" -#: readelf.c:2142 +#: readelf.c:2150 msgid "ELF Header:\n" msgstr "" -#: readelf.c:2143 +#: readelf.c:2151 msgid " Magic: " msgstr "" -#: readelf.c:2147 +#: readelf.c:2155 #, c-format msgid " Class: %s\n" msgstr "" -#: readelf.c:2149 +#: readelf.c:2157 #, c-format msgid " Data: %s\n" msgstr "" -#: readelf.c:2151 +#: readelf.c:2159 #, c-format msgid " Version: %d %s\n" msgstr "" -#: readelf.c:2158 +#: readelf.c:2166 #, c-format msgid " OS/ABI: %s\n" msgstr "" -#: readelf.c:2160 +#: readelf.c:2168 #, c-format msgid " ABI Version: %d\n" msgstr "" -#: readelf.c:2162 +#: readelf.c:2170 #, c-format msgid " Type: %s\n" msgstr "" -#: readelf.c:2164 +#: readelf.c:2172 #, c-format msgid " Machine: %s\n" msgstr "" -#: readelf.c:2166 +#: readelf.c:2174 #, c-format msgid " Version: 0x%lx\n" msgstr "" -#: readelf.c:2169 +#: readelf.c:2177 msgid " Entry point address: " msgstr "" -#: readelf.c:2171 +#: readelf.c:2179 msgid "" "\n" " Start of program headers: " msgstr "" -#: readelf.c:2173 +#: readelf.c:2181 msgid "" " (bytes into file)\n" " Start of section headers: " msgstr "" -#: readelf.c:2175 +#: readelf.c:2183 msgid " (bytes into file)\n" msgstr "" -#: readelf.c:2177 +#: readelf.c:2185 #, c-format msgid " Flags: 0x%lx%s\n" msgstr "" -#: readelf.c:2180 +#: readelf.c:2188 #, c-format msgid " Size of this header: %ld (bytes)\n" msgstr "" -#: readelf.c:2182 +#: readelf.c:2190 #, c-format msgid " Size of program headers: %ld (bytes)\n" msgstr "" -#: readelf.c:2184 +#: readelf.c:2192 #, c-format msgid " Number of program headers: %ld\n" msgstr "" -#: readelf.c:2186 +#: readelf.c:2194 #, c-format msgid " Size of section headers: %ld (bytes)\n" msgstr "" -#: readelf.c:2188 +#: readelf.c:2196 #, c-format msgid " Number of section headers: %ld\n" msgstr "" -#: readelf.c:2190 +#: readelf.c:2198 #, c-format msgid " Section header string table index: %ld\n" msgstr "" -#: readelf.c:2275 +#: readelf.c:2283 msgid "" "\n" "There are no program headers in this file.\n" msgstr "" -#: readelf.c:2281 +#: readelf.c:2289 #, c-format msgid "" "\n" "Elf file type is %s\n" msgstr "" -#: readelf.c:2282 +#: readelf.c:2290 msgid "Entry point " msgstr "" -#: readelf.c:2284 +#: readelf.c:2292 #, c-format msgid "" "\n" "There are %d program headers, starting at offset " msgstr "" -#: readelf.c:2295 readelf.c:2471 readelf.c:2513 readelf.c:2556 readelf.c:2597 -#: readelf.c:3115 readelf.c:3156 readelf.c:3332 readelf.c:4340 readelf.c:4354 -#: readelf.c:7597 readelf.c:7637 +#: readelf.c:2303 readelf.c:2479 readelf.c:2521 readelf.c:2564 readelf.c:2605 +#: readelf.c:3127 readelf.c:3168 readelf.c:3344 readelf.c:4352 readelf.c:4366 +#: readelf.c:7611 readelf.c:7651 msgid "Out of memory\n" msgstr "" -#: readelf.c:2313 +#: readelf.c:2321 #, c-format msgid "" "\n" "Program Header%s:\n" msgstr "" -#: readelf.c:2317 +#: readelf.c:2325 msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align\n" msgstr "" -#: readelf.c:2321 +#: readelf.c:2329 msgid " Type Offset VirtAddr PhysAddr\n" msgstr "" -#: readelf.c:2323 +#: readelf.c:2331 msgid " FileSiz MemSiz Flags Align\n" msgstr "" -#: readelf.c:2381 +#: readelf.c:2389 msgid "more than one dynamic segment\n" msgstr "" -#: readelf.c:2389 +#: readelf.c:2397 msgid "Unable to find program interpreter name\n" msgstr "" -#: readelf.c:2396 +#: readelf.c:2404 #, c-format msgid "" "\n" " [Requesting program interpreter: %s]" msgstr "" -#: readelf.c:2414 +#: readelf.c:2422 msgid "" "\n" " Section to Segment mapping:\n" msgstr "" -#: readelf.c:2415 +#: readelf.c:2423 msgid " Segment Sections...\n" msgstr "" -#: readelf.c:2679 +#: readelf.c:2687 msgid "" "\n" "There are no sections in this file.\n" msgstr "" -#: readelf.c:2685 +#: readelf.c:2693 #, c-format msgid "There are %d section headers, starting at offset 0x%lx:\n" msgstr "" -#: readelf.c:2725 +#: readelf.c:2733 msgid "File contains multiple dynamic symbol tables\n" msgstr "" -#: readelf.c:2738 +#: readelf.c:2746 msgid "File contains multiple dynamic string tables\n" msgstr "" -#: readelf.c:2768 +#: readelf.c:2780 #, c-format msgid "" "\n" "Section Header%s:\n" msgstr "" -#: readelf.c:2772 +#: readelf.c:2784 msgid "" " [Nr] Name Type Addr Off Size ES Flg Lk " "Inf Al\n" msgstr "" -#: readelf.c:2775 +#: readelf.c:2787 msgid " [Nr] Name Type Address Offset\n" msgstr "" -#: readelf.c:2776 +#: readelf.c:2788 msgid " Size EntSize Flags Link Info Align\n" msgstr "" -#: readelf.c:2823 +#: readelf.c:2835 msgid "Key to Flags:\n" msgstr "" -#: readelf.c:2824 +#: readelf.c:2836 msgid " W (write), A (alloc), X (execute), M (merge), S (strings)\n" msgstr "" -#: readelf.c:2825 +#: readelf.c:2837 msgid " I (info), L (link order), G (group), x (unknown)\n" msgstr "" -#: readelf.c:2826 +#: readelf.c:2838 msgid "" " O (extra OS processing required) o (OS specific), p (processor specific)\n" msgstr "" -#: readelf.c:2884 +#: readelf.c:2896 #, c-format msgid "" "\n" "Relocation section at offset 0x%lx contains %ld bytes:\n" msgstr "" -#: readelf.c:2891 +#: readelf.c:2903 msgid "" "\n" "There are no dynamic relocations in this file.\n" msgstr "" -#: readelf.c:2919 +#: readelf.c:2931 msgid "" "\n" "Relocation section " msgstr "" -#: readelf.c:2926 +#: readelf.c:2938 #, c-format msgid " at offset 0x%lx contains %lu entries:\n" msgstr "" -#: readelf.c:2954 +#: readelf.c:2966 msgid "" "\n" "There are no relocations in this file.\n" msgstr "" -#: readelf.c:3209 +#: readelf.c:3221 msgid "" "\n" "There is no dynamic segment in this file.\n" msgstr "" -#: readelf.c:3243 +#: readelf.c:3255 msgid "Unable to seek to end of file!" msgstr "" -#: readelf.c:3252 +#: readelf.c:3264 msgid "Unable to determine the number of symbols to load\n" msgstr "" -#: readelf.c:3282 +#: readelf.c:3294 msgid "Unable to seek to end of file\n" msgstr "" -#: readelf.c:3288 +#: readelf.c:3300 msgid "Unable to determine the length of the dynamic string table\n" msgstr "" -#: readelf.c:3349 +#: readelf.c:3361 #, c-format msgid "" "\n" "Dynamic segment at offset 0x%x contains %ld entries:\n" msgstr "" -#: readelf.c:3352 +#: readelf.c:3364 msgid " Tag Type Name/Value\n" msgstr "" -#: readelf.c:3388 +#: readelf.c:3400 msgid "Auxiliary library" msgstr "" -#: readelf.c:3392 +#: readelf.c:3404 msgid "Filter library" msgstr "" -#: readelf.c:3396 +#: readelf.c:3408 msgid "Configuration file" msgstr "" -#: readelf.c:3400 +#: readelf.c:3412 msgid "Dependency audit library" msgstr "" -#: readelf.c:3404 +#: readelf.c:3416 msgid "Audit library" msgstr "" -#: readelf.c:3422 readelf.c:3448 readelf.c:3474 +#: readelf.c:3434 readelf.c:3460 readelf.c:3486 msgid "Flags:" msgstr "" -#: readelf.c:3424 readelf.c:3450 readelf.c:3476 +#: readelf.c:3436 readelf.c:3462 readelf.c:3488 msgid " None\n" msgstr "" -#: readelf.c:3595 +#: readelf.c:3607 #, c-format msgid "Shared library: [%s]" msgstr "" -#: readelf.c:3598 +#: readelf.c:3610 msgid " program interpreter" msgstr "" -#: readelf.c:3602 +#: readelf.c:3614 #, c-format msgid "Library soname: [%s]" msgstr "" -#: readelf.c:3606 +#: readelf.c:3618 #, c-format msgid "Library rpath: [%s]" msgstr "" -#: readelf.c:3610 +#: readelf.c:3622 #, c-format msgid "Library runpath: [%s]" msgstr "" -#: readelf.c:3671 +#: readelf.c:3683 #, c-format msgid "Not needed object: [%s]\n" msgstr "" -#: readelf.c:3768 +#: readelf.c:3780 #, c-format msgid "" "\n" "Version definition section '%s' contains %ld entries:\n" msgstr "" -#: readelf.c:3771 +#: readelf.c:3783 msgid " Addr: 0x" msgstr "" -#: readelf.c:3773 readelf.c:3961 +#: readelf.c:3785 readelf.c:3973 #, c-format msgid " Offset: %#08lx Link: %lx (%s)\n" msgstr "" -#: readelf.c:3803 +#: readelf.c:3815 #, c-format msgid " %#06x: Rev: %d Flags: %s" msgstr "" -#: readelf.c:3806 +#: readelf.c:3818 #, c-format msgid " Index: %d Cnt: %d " msgstr "" -#: readelf.c:3817 +#: readelf.c:3829 #, c-format msgid "Name: %s\n" msgstr "" -#: readelf.c:3819 +#: readelf.c:3831 #, c-format msgid "Name index: %ld\n" msgstr "" -#: readelf.c:3834 +#: readelf.c:3846 #, c-format msgid " %#06x: Parent %d: %s\n" msgstr "" -#: readelf.c:3837 +#: readelf.c:3849 #, c-format msgid " %#06x: Parent %d, name index: %ld\n" msgstr "" -#: readelf.c:3856 +#: readelf.c:3868 #, c-format msgid "" "\n" "Version needs section '%s' contains %ld entries:\n" msgstr "" -#: readelf.c:3859 +#: readelf.c:3871 msgid " Addr: 0x" msgstr "" -#: readelf.c:3861 +#: readelf.c:3873 #, c-format msgid " Offset: %#08lx Link to section: %ld (%s)\n" msgstr "" -#: readelf.c:3887 +#: readelf.c:3899 #, c-format msgid " %#06x: Version: %d" msgstr "" -#: readelf.c:3890 +#: readelf.c:3902 #, c-format msgid " File: %s" msgstr "" -#: readelf.c:3892 +#: readelf.c:3904 #, c-format msgid " File: %lx" msgstr "" -#: readelf.c:3894 +#: readelf.c:3906 #, c-format msgid " Cnt: %d\n" msgstr "" -#: readelf.c:3912 +#: readelf.c:3924 #, c-format msgid " %#06x: Name: %s" msgstr "" -#: readelf.c:3915 +#: readelf.c:3927 #, c-format msgid " %#06x: Name index: %lx" msgstr "" -#: readelf.c:3918 +#: readelf.c:3930 #, c-format msgid " Flags: %s Version: %d\n" msgstr "" -#: readelf.c:3956 +#: readelf.c:3968 #, c-format msgid "" "\n" "Version symbols section '%s' contains %d entries:\n" msgstr "" -#: readelf.c:3959 +#: readelf.c:3971 msgid " Addr: " msgstr "" -#: readelf.c:3989 +#: readelf.c:4001 msgid " 0 (*local*) " msgstr "" -#: readelf.c:3993 +#: readelf.c:4005 msgid " 1 (*global*) " msgstr "" -#: readelf.c:4215 +#: readelf.c:4227 msgid "" "\n" "No version information found in this file.\n" msgstr "" -#: readelf.c:4233 readelf.c:4268 +#: readelf.c:4245 readelf.c:4280 #, c-format msgid "<processor specific>: %d" msgstr "" -#: readelf.c:4235 readelf.c:4280 +#: readelf.c:4247 readelf.c:4292 #, c-format msgid "<OS specific>: %d" msgstr "" -#: readelf.c:4237 readelf.c:4283 +#: readelf.c:4249 readelf.c:4295 #, c-format msgid "<unknown>: %d" msgstr "" -#: readelf.c:4346 +#: readelf.c:4358 msgid "Unable to read in dynamic data\n" msgstr "" -#: readelf.c:4388 +#: readelf.c:4400 msgid "Unable to seek to start of dynamic information" msgstr "" -#: readelf.c:4394 +#: readelf.c:4406 msgid "Failed to read in number of buckets\n" msgstr "" -#: readelf.c:4400 +#: readelf.c:4412 msgid "Failed to read in number of chains\n" msgstr "" -#: readelf.c:4420 +#: readelf.c:4432 msgid "" "\n" "Symbol table for image:\n" msgstr "" -#: readelf.c:4422 +#: readelf.c:4434 msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4424 +#: readelf.c:4436 msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4468 +#: readelf.c:4480 #, c-format msgid "" "\n" "Symbol table '%s' contains %lu entries:\n" msgstr "" -#: readelf.c:4472 +#: readelf.c:4484 msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4474 +#: readelf.c:4486 msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:4583 +#: readelf.c:4595 msgid "bad dynamic symbol" msgstr "" -#: readelf.c:4642 +#: readelf.c:4654 msgid "" "\n" "Dynamic symbol information is not available for displaying symbols.\n" msgstr "" -#: readelf.c:4654 +#: readelf.c:4666 #, c-format msgid "" "\n" "Histogram for bucket list length (total of %d buckets):\n" msgstr "" -#: readelf.c:4656 +#: readelf.c:4668 msgid " Length Number %% of total Coverage\n" msgstr "" -#: readelf.c:4661 readelf.c:4680 readelf.c:7279 readelf.c:7472 +#: readelf.c:4673 readelf.c:4692 readelf.c:7293 readelf.c:7486 msgid "Out of memory" msgstr "" -#: readelf.c:4729 +#: readelf.c:4741 #, c-format msgid "" "\n" "Dynamic info segment at offset 0x%lx contains %d entries:\n" msgstr "" -#: readelf.c:4732 +#: readelf.c:4744 msgid " Num: Name BoundTo Flags\n" msgstr "" -#: readelf.c:4780 +#: readelf.c:4792 #, c-format msgid "" "\n" "Assembly dump of section %s\n" msgstr "" -#: readelf.c:4803 +#: readelf.c:4815 #, c-format msgid "" "\n" "Section '%s' has no data to dump.\n" msgstr "" -#: readelf.c:4808 +#: readelf.c:4820 #, c-format msgid "" "\n" "Hex dump of section '%s':\n" msgstr "" -#: readelf.c:4960 +#: readelf.c:4972 msgid "badly formed extended line op encountered!" msgstr "" -#: readelf.c:4967 +#: readelf.c:4979 #, c-format msgid " Extended opcode %d: " msgstr "" -#: readelf.c:4972 +#: readelf.c:4984 msgid "" "End of Sequence\n" "\n" msgstr "" -#: readelf.c:4978 +#: readelf.c:4990 #, c-format msgid "set Address to 0x%lx\n" msgstr "" -#: readelf.c:4983 +#: readelf.c:4995 msgid " define new File Table entry\n" msgstr "" -#: readelf.c:4984 readelf.c:5106 +#: readelf.c:4996 readelf.c:5118 msgid " Entry\tDir\tTime\tSize\tName\n" msgstr "" -#: readelf.c:4986 +#: readelf.c:4998 #, c-format msgid " %d\t" msgstr "" -#: readelf.c:4989 readelf.c:4991 readelf.c:4993 readelf.c:5118 readelf.c:5120 -#: readelf.c:5122 +#: readelf.c:5001 readelf.c:5003 readelf.c:5005 readelf.c:5130 readelf.c:5132 +#: readelf.c:5134 #, c-format msgid "%lu\t" msgstr "" -#: readelf.c:4994 +#: readelf.c:5006 #, c-format msgid "" "%s\n" "\n" msgstr "" -#: readelf.c:4998 +#: readelf.c:5010 #, c-format msgid "UNKNOWN: length %d\n" msgstr "" -#: readelf.c:5024 +#: readelf.c:5036 #, c-format msgid "" "\n" @@ -2981,502 +2981,503 @@ msgid "" "\n" msgstr "" -#: readelf.c:5036 +#: readelf.c:5048 msgid "The line info appears to be corrupt - the section is too small\n" msgstr "" -#: readelf.c:5044 +#: readelf.c:5056 msgid "Only DWARF version 2 line info is currently supported.\n" msgstr "" -#: readelf.c:5059 +#: readelf.c:5071 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:5060 +#: readelf.c:5072 #, c-format msgid " DWARF Version: %d\n" msgstr "" -#: readelf.c:5061 +#: readelf.c:5073 #, c-format msgid " Prolgue Length: %d\n" msgstr "" -#: readelf.c:5062 +#: readelf.c:5074 #, c-format msgid " Minimum Instruction Length: %d\n" msgstr "" -#: readelf.c:5063 +#: readelf.c:5075 #, c-format msgid " Initial value of 'is_stmt': %d\n" msgstr "" -#: readelf.c:5064 +#: readelf.c:5076 #, c-format msgid " Line Base: %d\n" msgstr "" -#: readelf.c:5065 +#: readelf.c:5077 #, c-format msgid " Line Range: %d\n" msgstr "" -#: readelf.c:5066 +#: readelf.c:5078 #, c-format msgid " Opcode Base: %d\n" msgstr "" -#: readelf.c:5075 +#: readelf.c:5087 msgid "" "\n" " Opcodes:\n" msgstr "" -#: readelf.c:5078 +#: readelf.c:5090 #, c-format msgid " Opcode %d has %d args\n" msgstr "" -#: readelf.c:5084 +#: readelf.c:5096 msgid "" "\n" " The Directory Table is empty.\n" msgstr "" -#: readelf.c:5087 +#: readelf.c:5099 msgid "" "\n" " The Directory Table:\n" msgstr "" -#: readelf.c:5091 +#: readelf.c:5103 #, c-format msgid " %s\n" msgstr "" -#: readelf.c:5102 +#: readelf.c:5114 msgid "" "\n" " The File Name Table is empty.\n" msgstr "" -#: readelf.c:5105 +#: readelf.c:5117 msgid "" "\n" " The File Name Table:\n" msgstr "" -#: readelf.c:5113 +#: readelf.c:5125 #, c-format msgid " %d\t" msgstr "" -#: readelf.c:5124 +#: readelf.c:5136 #, c-format msgid "%s\n" msgstr "" #. Now display the statements. -#: readelf.c:5132 +#: readelf.c:5144 msgid "" "\n" " Line Number Statements:\n" msgstr "" -#: readelf.c:5151 +#: readelf.c:5163 msgid " Copy\n" msgstr "" -#: readelf.c:5158 +#: readelf.c:5170 #, c-format msgid " Advance PC by %d to %lx\n" msgstr "" -#: readelf.c:5166 +#: readelf.c:5178 #, c-format msgid " Advance Line by %d to %d\n" msgstr "" -#: readelf.c:5173 +#: readelf.c:5185 #, c-format msgid " Set File Name to entry %d in the File Name Table\n" msgstr "" -#: readelf.c:5181 +#: readelf.c:5193 #, c-format msgid " Set column to %d\n" msgstr "" -#: readelf.c:5188 +#: readelf.c:5200 #, c-format msgid " Set is_stmt to %d\n" msgstr "" -#: readelf.c:5193 +#: readelf.c:5205 msgid " Set basic block\n" msgstr "" -#: readelf.c:5201 +#: readelf.c:5213 #, c-format msgid " Advance PC by constant %d to 0x%lx\n" msgstr "" -#: readelf.c:5209 +#: readelf.c:5221 #, c-format msgid " Advance PC by fixed size amount %d to 0x%lx\n" msgstr "" -#: readelf.c:5217 +#: readelf.c:5229 #, c-format msgid " Special opcode %d: advance Address by %d to 0x%lx" msgstr "" -#: readelf.c:5221 +#: readelf.c:5233 #, c-format msgid " and Line by %d to %d\n" msgstr "" -#: readelf.c:5244 readelf.c:5673 +#: readelf.c:5256 readelf.c:5685 #, c-format msgid "" "Contents of the %s section:\n" "\n" msgstr "" -#: readelf.c:5267 +#: readelf.c:5279 msgid "Only DWARF 2 pubnames are currently supported\n" msgstr "" -#: readelf.c:5274 +#: readelf.c:5286 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:5276 +#: readelf.c:5288 #, c-format msgid " Version: %d\n" msgstr "" -#: readelf.c:5278 +#: readelf.c:5290 #, c-format msgid " Offset into .debug_info section: %ld\n" msgstr "" -#: readelf.c:5280 +#: readelf.c:5292 #, c-format msgid " Size of area in .debug_info section: %ld\n" msgstr "" -#: readelf.c:5283 +#: readelf.c:5295 msgid "" "\n" " Offset\tName\n" msgstr "" -#: readelf.c:5365 +#: readelf.c:5377 #, c-format msgid "Unknown TAG value: %lx" msgstr "" -#: readelf.c:5460 +#: readelf.c:5472 #, c-format msgid "Unknown AT value: %lx" msgstr "" -#: readelf.c:5497 +#: readelf.c:5509 #, c-format msgid "Unknown FORM value: %lx" msgstr "" -#: readelf.c:5679 +#: readelf.c:5691 msgid " Number TAG\n" msgstr "" -#: readelf.c:5685 +#: readelf.c:5697 #, c-format msgid " %ld %s [%s]\n" msgstr "" -#: readelf.c:5688 +#: readelf.c:5700 msgid "has children" msgstr "" -#: readelf.c:5688 +#: readelf.c:5700 msgid "no children" msgstr "" -#: readelf.c:5692 +#: readelf.c:5704 #, c-format msgid " %-18s %s\n" msgstr "" -#: readelf.c:5711 +#: readelf.c:5723 #, c-format msgid " %lu byte block: " msgstr "" -#: readelf.c:6018 +#: readelf.c:6030 msgid "(User defined location op)" msgstr "" -#: readelf.c:6020 +#: readelf.c:6032 msgid "(Unknown location op)" msgstr "" -#: readelf.c:6147 +#: readelf.c:6159 #, c-format msgid "Unable to handle FORM: %d" msgstr "" -#: readelf.c:6151 +#: readelf.c:6163 #, c-format msgid "Unrecognised form: %d" msgstr "" -#: readelf.c:6164 +#: readelf.c:6176 msgid "(not inlined)" msgstr "" -#: readelf.c:6165 +#: readelf.c:6177 msgid "(inlined)" msgstr "" -#: readelf.c:6166 +#: readelf.c:6178 msgid "(declared as inline but ignored)" msgstr "" -#: readelf.c:6167 +#: readelf.c:6179 msgid "(declared as inline and inlined)" msgstr "" -#: readelf.c:6168 +#: readelf.c:6180 #, c-format msgid " (Unknown inline attribute value: %lx)" msgstr "" -#: readelf.c:6297 readelf.c:6423 +#: readelf.c:6309 readelf.c:6435 #, c-format msgid "" "The section %s contains:\n" "\n" msgstr "" -#: readelf.c:6321 -msgid "Only version 2 DWARF debug information is currently supported.\n" -msgstr "" - -#: readelf.c:6325 -msgid " Compilation Unit:\n" +#: readelf.c:6331 +#, c-format +msgid " Compilation Unit @ %lx:\n" msgstr "" -#: readelf.c:6326 +#: readelf.c:6332 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:6327 +#: readelf.c:6333 #, c-format msgid " Version: %d\n" msgstr "" -#: readelf.c:6328 +#: readelf.c:6334 #, c-format msgid " Abbrev Offset: %ld\n" msgstr "" -#: readelf.c:6329 +#: readelf.c:6335 #, c-format msgid " Pointer Size: %d\n" msgstr "" -#: readelf.c:6349 +#: readelf.c:6339 +msgid "Only version 2 DWARF debug information is currently supported.\n" +msgstr "" + +#: readelf.c:6361 msgid "Unable to locate .debug_abbrev section!\n" msgstr "" -#: readelf.c:6389 +#: readelf.c:6401 #, c-format msgid "Unable to locate entry %lu in the abbreviation table\n" msgstr "" -#: readelf.c:6394 +#: readelf.c:6406 #, c-format msgid " <%d><%x>: Abbrev Number: %lu (%s)\n" msgstr "" -#: readelf.c:6444 +#: readelf.c:6456 msgid "Only DWARF 2 aranges are currently supported.\n" msgstr "" -#: readelf.c:6448 +#: readelf.c:6460 #, c-format msgid " Length: %ld\n" msgstr "" -#: readelf.c:6449 +#: readelf.c:6461 #, c-format msgid " Version: %d\n" msgstr "" -#: readelf.c:6450 +#: readelf.c:6462 #, c-format msgid " Offset into .debug_info: %lx\n" msgstr "" -#: readelf.c:6451 +#: readelf.c:6463 #, c-format msgid " Pointer Size: %d\n" msgstr "" -#: readelf.c:6452 +#: readelf.c:6464 #, c-format msgid " Segment Size: %d\n" msgstr "" -#: readelf.c:6454 +#: readelf.c:6466 msgid "" "\n" " Address Length\n" msgstr "" -#: readelf.c:6598 +#: readelf.c:6610 #, c-format msgid "The section %s contains:\n" msgstr "" -#: readelf.c:6968 +#: readelf.c:6980 #, c-format msgid "Displaying the debug contents of section %s is not yet supported.\n" msgstr "" -#: readelf.c:7032 +#: readelf.c:7044 #, c-format msgid "" "\n" "Section '%s' has no debugging data.\n" msgstr "" -#: readelf.c:7048 +#: readelf.c:7062 #, c-format msgid "Unrecognised debug section: %s\n" msgstr "" -#: readelf.c:7120 +#: readelf.c:7134 msgid "Some sections were not dumped because they do not exist!\n" msgstr "" -#: readelf.c:7303 +#: readelf.c:7317 #, c-format msgid "" "\n" "Section '%s' contains %d entries:\n" msgstr "" -#: readelf.c:7465 +#: readelf.c:7479 msgid "conflict list with without table" msgstr "" -#: readelf.c:7493 +#: readelf.c:7507 #, c-format msgid "" "\n" "Section '.conflict' contains %d entries:\n" msgstr "" -#: readelf.c:7494 +#: readelf.c:7508 msgid " Num: Index Value Name" msgstr "" -#: readelf.c:7519 +#: readelf.c:7533 msgid "NT_PRSTATUS (prstatus structure)" msgstr "" -#: readelf.c:7520 +#: readelf.c:7534 msgid "NT_FPREGSET (floating point registers)" msgstr "" -#: readelf.c:7521 +#: readelf.c:7535 msgid "NT_PRPSINFO (prpsinfo structure)" msgstr "" -#: readelf.c:7522 +#: readelf.c:7536 msgid "NT_TASKSTRUCT (task structure)" msgstr "" -#: readelf.c:7523 +#: readelf.c:7537 msgid "NT_PRXFPREG (user_xfpregs structure)" msgstr "" -#: readelf.c:7524 +#: readelf.c:7538 msgid "NT_PSTATUS (pstatus structure)" msgstr "" -#: readelf.c:7525 +#: readelf.c:7539 msgid "NT_FPREGS (floating point registers)" msgstr "" -#: readelf.c:7526 +#: readelf.c:7540 msgid "NT_PSINFO (psinfo structure)" msgstr "" -#: readelf.c:7527 +#: readelf.c:7541 msgid "NT_LWPSTATUS (lwpstatus_t structure)" msgstr "" -#: readelf.c:7528 +#: readelf.c:7542 msgid "NT_LWPSINFO (lwpsinfo_t structure)" msgstr "" -#: readelf.c:7529 +#: readelf.c:7543 msgid "NT_WIN32PSTATUS (win32_pstatus strcuture)" msgstr "" -#: readelf.c:7531 +#: readelf.c:7545 #, c-format msgid "Unknown note type: (0x%08x)" msgstr "" -#: readelf.c:7569 +#: readelf.c:7583 #, c-format msgid "" "\n" "Notes at offset 0x%08lx with length 0x%08lx:\n" msgstr "" -#: readelf.c:7571 +#: readelf.c:7585 msgid " Owner\t\tData size\tDescription\n" msgstr "" -#: readelf.c:7682 +#: readelf.c:7696 msgid "No note segments present in the core file.\n" msgstr "" -#: readelf.c:7760 +#: readelf.c:7774 msgid "This instance of readelf has been built without support for a\n" msgstr "" -#: readelf.c:7761 +#: readelf.c:7775 msgid "64 bit data type and so it cannot read 64 bit ELF files.\n" msgstr "" -#: readelf.c:7796 +#: readelf.c:7810 #, c-format msgid "Cannot stat input file %s.\n" msgstr "" -#: readelf.c:7803 +#: readelf.c:7817 #, c-format msgid "Input file %s not found.\n" msgstr "" -#: readelf.c:7809 +#: readelf.c:7823 #, c-format msgid "%s: Failed to read file header\n" msgstr "" -#: readelf.c:7823 +#: readelf.c:7837 #, c-format msgid "" "\n" diff --git a/binutils/readelf.c b/binutils/readelf.c index 42e707d1d0..c2955470a5 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -872,6 +872,7 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela) break; case EM_CYGNUS_ARC: + case EM_ARC: rtype = elf_arc_reloc_type (type); break; @@ -1224,7 +1225,7 @@ get_machine_name (e_machine) case EM_SH: return "Hitachi SH"; case EM_SPARCV9: return "Sparc v9"; case EM_TRICORE: return "Siemens Tricore"; - case EM_ARC: return "Argonaut RISC Core"; + case EM_ARC: return "ARC"; case EM_H8_300: return "Hitachi H8/300"; case EM_H8_300H: return "Hitachi H8/300H"; case EM_H8S: return "Hitachi H8S"; @@ -1236,7 +1237,7 @@ get_machine_name (e_machine) case EM_ALPHA: return "Alpha"; case EM_CYGNUS_D10V: return "d10v"; case EM_CYGNUS_D30V: return "d30v"; - case EM_CYGNUS_ARC: return "Arc"; + case EM_CYGNUS_ARC: return "ARC"; case EM_CYGNUS_M32R: return "Mitsubishi M32r"; case EM_CYGNUS_V850: return "NEC v850"; case EM_CYGNUS_MN10300: return "mn10300"; @@ -1269,7 +1270,6 @@ get_machine_name (e_machine) case EM_MMIX: return "Donald Knuth's educational 64-bit processor"; case EM_HUANY: return "Harvard Universitys's machine-independent object format"; case EM_PRISM: return "SiTera Prism"; - default: sprintf (buff, _("<unknown>: %x"), e_machine); return buff; @@ -4654,13 +4654,13 @@ process_symbol_table (file) if (do_histogram && buckets != NULL) { - int *lengths; - int *counts; - int hn; - int si; - int maxlength = 0; - int nzero_counts = 0; - int nsyms = 0; + int * lengths; + int * counts; + int hn; + int si; + int maxlength = 0; + int nzero_counts = 0; + int nsyms = 0; printf (_("\nHistogram for bucket list length (total of %d buckets):\n"), nbuckets); @@ -5678,7 +5678,7 @@ display_debug_abbrev (section, start, file) unsigned char * start; FILE * file ATTRIBUTE_UNUSED; { - abbrev_entry * entry; + abbrev_entry * entry; unsigned char * end = start + section->sh_size; printf (_("Contents of the %s section:\n\n"), SECTION_NAME (section)); @@ -5731,12 +5731,12 @@ static void decode_location_expression (data, pointer_size, length) unsigned char * data; unsigned int pointer_size; - unsigned long length; + unsigned long length; { - unsigned op; - int bytes_read; - unsigned long uvalue; - unsigned char *end = data + length; + unsigned op; + int bytes_read; + unsigned long uvalue; + unsigned char * end = data + length; while (data < end) { @@ -6467,7 +6467,7 @@ display_debug_aranges (section, start, file) ranges = start + sizeof (* external); /* Must pad to an alignment boundary that is twice the pointer size. */ - excess = sizeof (*external) % (2 * arange.ar_pointer_size); + excess = sizeof (* external) % (2 * arange.ar_pointer_size); if (excess) ranges += (2 * arange.ar_pointer_size) - excess; @@ -6498,20 +6498,20 @@ display_debug_aranges (section, start, file) typedef struct Frame_Chunk { - struct Frame_Chunk *next; - unsigned char *chunk_start; - int ncols; + struct Frame_Chunk * next; + unsigned char * chunk_start; + int ncols; /* DW_CFA_{undefined,same_value,offset,register,unreferenced} */ - short int *col_type; - int *col_offset; - char *augmentation; - unsigned int code_factor; - unsigned int data_factor; - unsigned long pc_begin; - unsigned long pc_range; - int cfa_reg; - int cfa_offset; - int ra; + short int * col_type; + int * col_offset; + char * augmentation; + unsigned int code_factor; + unsigned int data_factor; + unsigned long pc_begin; + unsigned long pc_range; + int cfa_reg; + int cfa_offset; + int ra; } Frame_Chunk; @@ -6521,13 +6521,14 @@ Frame_Chunk; static void frame_need_space (fc, reg) - Frame_Chunk *fc; + Frame_Chunk * fc; int reg; { int prev = fc->ncols; if (reg < fc->ncols) return; + fc->ncols = reg + 1; fc->col_type = (short int *) xrealloc (fc->col_type, fc->ncols * sizeof (short int)); @@ -6544,20 +6545,23 @@ frame_need_space (fc, reg) static void frame_display_row (fc, need_col_headers, max_regs) - Frame_Chunk *fc; - int *need_col_headers; - int *max_regs; + Frame_Chunk * fc; + int * need_col_headers; + int * max_regs; { int r; char tmp[100]; - if (*max_regs < fc->ncols) - *max_regs = fc->ncols; - if (*need_col_headers) + if (* max_regs < fc->ncols) + * max_regs = fc->ncols; + + if (* need_col_headers) { - *need_col_headers = 0; + * need_col_headers = 0; + printf (" LOC CFA "); - for (r=0; r<*max_regs; r++) + + for (r = 0; r < * max_regs; r++) if (fc->col_type[r] != DW_CFA_unreferenced) { if (r == fc->ra) @@ -6565,12 +6569,15 @@ frame_display_row (fc, need_col_headers, max_regs) else printf ("r%-4d", r); } + printf ("\n"); } + printf ("%08x ", (unsigned int) fc->pc_begin); sprintf (tmp, "r%d%+d", fc->cfa_reg, fc->cfa_offset); printf ("%-8s ", tmp); - for (r=0; r<fc->ncols; r++) + + for (r = 0; r < fc->ncols; r++) { if (fc->col_type[r] != DW_CFA_unreferenced) { @@ -6599,8 +6606,8 @@ frame_display_row (fc, need_col_headers, max_regs) } #define GET(N) byte_get (start, N); start += N -#define LEB() read_leb128 (start, &length_return, 0); start += length_return -#define SLEB() read_leb128 (start, &length_return, 1); start += length_return +#define LEB() read_leb128 (start, & length_return, 0); start += length_return +#define SLEB() read_leb128 (start, & length_return, 1); start += length_return static int display_debug_frames (section, start, file) @@ -6609,21 +6616,25 @@ display_debug_frames (section, start, file) FILE * file ATTRIBUTE_UNUSED; { unsigned char * end = start + section->sh_size; - unsigned char *section_start = start; - Frame_Chunk *chunks = 0; - Frame_Chunk *remembered_state = 0, *rs; - int is_eh = (strcmp (SECTION_NAME (section), ".eh_frame") == 0); - int length_return; - int max_regs = 0; + unsigned char * section_start = start; + Frame_Chunk * chunks = 0; + Frame_Chunk * remembered_state = 0; + Frame_Chunk * rs; + int is_eh = (strcmp (SECTION_NAME (section), ".eh_frame") == 0); + int length_return; + int max_regs = 0; printf (_("The section %s contains:\n"), SECTION_NAME (section)); while (start < end) { - unsigned char *saved_start, *block_end; - unsigned long length, cie_id; - Frame_Chunk *fc, *cie; - int need_col_headers = 1; + unsigned char * saved_start; + unsigned char * block_end; + unsigned long length; + unsigned long cie_id; + Frame_Chunk * fc; + Frame_Chunk * cie; + int need_col_headers = 1; saved_start = start; length = byte_get (start, 4); start += 4; @@ -6651,7 +6662,12 @@ display_debug_frames (section, start, file) start ++; /* version */ fc->augmentation = start; - while (*start) start++; start++; /* skip past NUL */ + + while (* start) + start++; + + start++; /* skip past NUL */ + if (fc->augmentation[0] == 'z') { int xtra; @@ -6683,9 +6699,10 @@ display_debug_frames (section, start, file) } else { - unsigned char *look_for; + unsigned char * look_for; static Frame_Chunk fde_fc; - fc = &fde_fc; + + fc = & fde_fc; memset (fc, 0, sizeof (Frame_Chunk)); look_for = is_eh ? start-4-cie_id : (unsigned char *) cie_id; @@ -6701,7 +6718,7 @@ display_debug_frames (section, start, file) fc->ncols = 0; fc->col_type = (short int *) xmalloc (sizeof (short int)); fc->col_offset = (int *) xmalloc (sizeof (int)); - frame_need_space (fc, max_regs-1); + frame_need_space (fc, max_regs - 1); cie = fc; fc->augmentation = ""; } @@ -6741,15 +6758,15 @@ display_debug_frames (section, start, file) { /* Start by making a pass over the chunk, allocating storage and taking note of what registers are used. */ + unsigned char * tmp = start; - unsigned char *tmp = start; while (start < block_end) { unsigned op, opa; unsigned long reg; bfd_vma vma; - op = *start++; + op = * start ++; opa = op & 0x3f; if (op & 0xc0) op &= 0xc0; @@ -7156,6 +7173,7 @@ display_debug_section (section, file) /* See if we know how to display the contents of this section. */ if (strncmp (name, ".gnu.linkonce.wi.", 17) == 0) name = ".debug_info"; + for (i = NUM_ELEM (debug_displays); i--;) if (strcmp (debug_displays[i].name, name) == 0) { @@ -7392,7 +7410,7 @@ process_mips_specific (file) Elf_External_Options *, "options"); iopt = (Elf_Internal_Options *) malloc ((sect->sh_size / sizeof (eopt)) - * sizeof (*iopt)); + * sizeof (* iopt)); if (iopt == NULL) { error (_("Out of memory")); @@ -7439,8 +7457,8 @@ process_mips_specific (file) if (elf_header.e_machine == EM_MIPS) { /* 32bit form. */ - Elf32_External_RegInfo *ereg; - Elf32_RegInfo reginfo; + Elf32_External_RegInfo * ereg; + Elf32_RegInfo reginfo; ereg = (Elf32_External_RegInfo *) (option + 1); reginfo.ri_gprmask = BYTE_GET (ereg->ri_gprmask); @@ -7557,7 +7575,7 @@ process_mips_specific (file) break; } - len = sizeof (*eopt); + len = sizeof (* eopt); while (len < option->size) if (((char *) option)[len] >= ' ' && ((char *) option)[len] < 0x7f) @@ -7585,7 +7603,7 @@ process_mips_specific (file) return 0; } - iconf = (Elf32_Conflict *) malloc (conflictsno * sizeof (*iconf)); + iconf = (Elf32_Conflict *) malloc (conflictsno * sizeof (* iconf)); if (iconf == NULL) { error (_("Out of memory")); @@ -7594,7 +7612,7 @@ process_mips_specific (file) if (is_32bit_elf) { - GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf32), + GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (* econf32), econf32, Elf32_External_Conflict *, "conflict"); for (cnt = 0; cnt < conflictsno; ++cnt) @@ -7602,7 +7620,7 @@ process_mips_specific (file) } else { - GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (*econf64), + GET_DATA_ALLOC (conflicts_offset, conflictsno * sizeof (* econf64), econf64, Elf64_External_Conflict *, "conflict"); for (cnt = 0; cnt < conflictsno; ++cnt) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4dde5917a4..5e683a3db1 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -4,7 +4,8 @@ * input-scrub.c: Fix formatting. * macro.c: Fix formatting. * config/tc-mips.c: Fix formatting. - + * doc/c-mips.texi: Fix formatting. + Mon Dec 11 14:35:42 MET 2000 Jan hubicka <jh@suse.cz> * tc-i386.c (md_assemble): Refuse 's' and 'l' suffixes in the intel diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi index cb9579fbb5..8d76b02721 100644 --- a/gas/doc/c-mips.texi +++ b/gas/doc/c-mips.texi @@ -14,11 +14,10 @@ @cindex MIPS processor @sc{gnu} @code{@value{AS}} for @sc{mips} architectures supports several different @sc{mips} processors, and MIPS ISA levels I through V, MIPS32, -and MIPS64. For -information about the @sc{mips} instruction set, see @cite{MIPS RISC -Architecture}, by Kane and Heindrich (Prentice-Hall). For an overview -of @sc{mips} assembly conventions, see ``Appendix D: Assembly Language -Programming'' in the same work. +and MIPS64. For information about the @sc{mips} instruction set, see +@cite{MIPS RISC Architecture}, by Kane and Heindrich (Prentice-Hall). +For an overview of @sc{mips} assembly conventions, see ``Appendix D: +Assembly Language Programming'' in the same work. @menu * MIPS Opts:: Assembler options @@ -68,12 +67,11 @@ Generate code for a particular MIPS Instruction Set Architecture level. @samp{-mips1} corresponds to the @sc{r2000} and @sc{r3000} processors, @samp{-mips2} to the @sc{r6000} processor, @samp{-mips3} to the @sc{r4000} processor, and @samp{-mips4} to the @sc{r8000} and -@sc{r10000} processors. -@samp{-mips5}, @samp{-mips32}, and @samp{-mips64} correspond -to generic @sc{MIPS V}, @sc{MIPS32}, and @sc{MIPS64} ISA -processors, respectively. -You can also switch instruction sets during the -assembly; see @ref{MIPS ISA, Directives to override the ISA level}. +@sc{r10000} processors. @samp{-mips5}, @samp{-mips32}, and +@samp{-mips64} correspond to generic @sc{MIPS V}, @sc{MIPS32}, and +@sc{MIPS64} ISA processors, respectively. You can also switch +instruction sets during the assembly; see @ref{MIPS ISA, Directives to +override the ISA level}. @item -mgp32 Assume that 32-bit general purpose registers are available. This @@ -248,14 +246,14 @@ assembly language programmers! the @sc{mips} Instruction Set Architecture level on the fly: @code{.set mips@var{n}}. @var{n} should be a number from 0 to 5, or 32 or 64. The values 1 to 5, 32, and 64 make the assembler accept instructions -for the corresponding -@sc{isa} level, from that point on in the assembly. @code{.set -mips@var{n}} affects not only which instructions are permitted, but also -how certain macros are expanded. @code{.set mips0} restores the -@sc{isa} level to its original level: either the level you selected with -command line options, or the default for your configuration. You can -use this feature to permit specific @sc{r4000} instructions while -assembling in 32 bit mode. Use this directive with care! +for the corresponding @sc{isa} level, from that point on in the +assembly. @code{.set mips@var{n}} affects not only which instructions +are permitted, but also how certain macros are expanded. @code{.set +mips0} restores the @sc{isa} level to its original level: either the +level you selected with command line options, or the default for your +configuration. You can use this feature to permit specific @sc{r4000} +instructions while assembling in 32 bit mode. Use this directive with +care! The directive @samp{.set mips16} puts the assembler into MIPS 16 mode, in which it will assemble instructions for the MIPS 16 processor. Use |