summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/binutils/bfd/cf-m68klynx.c5
-rw-r--r--gnu/usr.bin/binutils/bfd/dep-in.sed4
-rw-r--r--gnu/usr.bin/binutils/bfd/doc/bfd.texinfo4
-rw-r--r--gnu/usr.bin/binutils/bfd/elf64-alpha.c81
-rw-r--r--gnu/usr.bin/binutils/bfd/evax-alpha.c11
-rw-r--r--gnu/usr.bin/binutils/bfd/evax-egsd.c29
-rw-r--r--gnu/usr.bin/binutils/bfd/evax-emh.c99
-rw-r--r--gnu/usr.bin/binutils/bfd/evax-etir.c61
-rw-r--r--gnu/usr.bin/binutils/bfd/evax-misc.c243
-rw-r--r--gnu/usr.bin/binutils/bfd/evax.h9
-rw-r--r--gnu/usr.bin/binutils/bfd/freebsd.h11
-rw-r--r--gnu/usr.bin/binutils/bfd/hosts/i386bsd.h7
-rw-r--r--gnu/usr.bin/binutils/bfd/netbsd-core.c1
-rw-r--r--gnu/usr.bin/binutils/binutils/makefile.vms2
-rw-r--r--gnu/usr.bin/binutils/binutils/size.c10
-rw-r--r--gnu/usr.bin/binutils/binutils/version.c46
-rw-r--r--gnu/usr.bin/binutils/config/mpw/ChangeLog4
-rw-r--r--gnu/usr.bin/binutils/config/mpw/g-mpw-make.sed3
-rw-r--r--gnu/usr.bin/binutils/config/mt-ppc2
-rw-r--r--gnu/usr.bin/binutils/etc/configure.in20
-rw-r--r--gnu/usr.bin/binutils/gas/README-quirks7
-rw-r--r--gnu/usr.bin/binutils/gas/README.coff79
-rw-r--r--gnu/usr.bin/binutils/gas/README.rich143
-rw-r--r--gnu/usr.bin/binutils/gas/config/obj-ecoff.c1
-rw-r--r--gnu/usr.bin/binutils/gas/config/obj-ecoff.h10
-rw-r--r--gnu/usr.bin/binutils/gas/config/obj-evax.h20
-rw-r--r--gnu/usr.bin/binutils/gas/macro.c13
-rw-r--r--gnu/usr.bin/binutils/gas/macro.h3
-rw-r--r--gnu/usr.bin/binutils/gas/obj.h1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/all/cofftag.s2
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/arm/thumb.s6
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branches.s10
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branchesh.s12
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/h8300/macs.s2
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshift.s11
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshifth.s27
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/hppa/reloc/reloc.exp2
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.d25
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.s27
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.d88
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.s59
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.d17
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.s1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/add.s1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/and.s1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/div-ilocks.d195
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/div.s1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-empic.d34
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-xgot.d66
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal.d34
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/la-xgot.d1218
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/lb-xgot.d466
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/ld-xgot.d528
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/li.s3
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/lif-xgot.d38
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.d86
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.s22
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul-ilocks.d131
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul.s1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.d59
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.s3
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/trunc.s1
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-empic.d164
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-xgot.d290
-rw-r--r--gnu/usr.bin/binutils/gas/testsuite/lib/gas-defs.exp9
-rw-r--r--gnu/usr.bin/binutils/gas/xmalloc.c70
66 files changed, 2178 insertions, 2461 deletions
diff --git a/gnu/usr.bin/binutils/bfd/cf-m68klynx.c b/gnu/usr.bin/binutils/bfd/cf-m68klynx.c
index 8149dc68319..6425c3013e7 100644
--- a/gnu/usr.bin/binutils/bfd/cf-m68klynx.c
+++ b/gnu/usr.bin/binutils/bfd/cf-m68klynx.c
@@ -1,5 +1,5 @@
/* BFD back-end for Motorola M68K COFF LynxOS files.
- Copyright 1993, 1994, 1995 Free Software Foundation, Inc.
+ Copyright 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
@@ -202,6 +202,9 @@ coff_m68k_lynx_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
howto = relent.howto;
+ if (howto->pc_relative)
+ *addendp += sec->vma;
+
if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
{
/* This is a common symbol. The section contents include the
diff --git a/gnu/usr.bin/binutils/bfd/dep-in.sed b/gnu/usr.bin/binutils/bfd/dep-in.sed
index 1cbd786fb2e..d1b565a01f4 100644
--- a/gnu/usr.bin/binutils/bfd/dep-in.sed
+++ b/gnu/usr.bin/binutils/bfd/dep-in.sed
@@ -1,12 +1,14 @@
:loop
/\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
s! @BFD_H@!!g
s!@INCDIR@!$(INCDIR)!g
s!@SRCDIR@/!!g
s!hosts/[^ ]*\.h ! !g
s/ sysdep.h//g
+s! \.\./bfd/sysdep.h!!g
s/ libbfd.h//g
s/ config.h//g
s! \$(INCDIR)/fopen-[^ ]*\.h!!g
diff --git a/gnu/usr.bin/binutils/bfd/doc/bfd.texinfo b/gnu/usr.bin/binutils/bfd/doc/bfd.texinfo
index 424bb0e0f8b..fd8ed7db137 100644
--- a/gnu/usr.bin/binutils/bfd/doc/bfd.texinfo
+++ b/gnu/usr.bin/binutils/bfd/doc/bfd.texinfo
@@ -1,6 +1,6 @@
\input texinfo.tex
@setfilename bfd.info
-@c $Id: bfd.texinfo,v 1.1.1.1 1996/01/08 11:05:17 niklas Exp $
+@c $Id: bfd.texinfo,v 1.1.1.2 1996/11/19 14:13:12 niklas Exp $
@tex
% NOTE LOCAL KLUGE TO AVOID TOO MUCH WHITESPACE
\global\long\def\example{%
@@ -67,7 +67,7 @@ into another language, under the above conditions for modified versions.
@tex
\def\$#1${{#1}} % Kluge: collect RCS revision info without $...$
-\xdef\manvers{\$Revision: 1.1.1.1 $} % For use in headers, footers too
+\xdef\manvers{\$Revision: 1.1.1.2 $} % For use in headers, footers too
{\parskip=0pt
\hfill Cygnus Support\par
\hfill sac\@cygnus.com\par
diff --git a/gnu/usr.bin/binutils/bfd/elf64-alpha.c b/gnu/usr.bin/binutils/bfd/elf64-alpha.c
index 52d1732b2d0..43fbe4965a6 100644
--- a/gnu/usr.bin/binutils/bfd/elf64-alpha.c
+++ b/gnu/usr.bin/binutils/bfd/elf64-alpha.c
@@ -301,13 +301,13 @@ static reloc_howto_type elf64_alpha_howto_table[] =
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
0, /* special_function */
- "LITERAL", /* name */
+ "ELF_LITERAL", /* name */
false, /* partial_inplace */
0xffff, /* src_mask */
0xffff, /* dst_mask */
false), /* pcrel_offset */
- /* This reloc only appears immediately following a LITERAL reloc.
+ /* This reloc only appears immediately following an ELF_LITERAL reloc.
It identifies a use of the literal. The symbol index is special:
1 means the literal address is in the base register of a memory
format instruction; 2 means the literal address is in the byte
@@ -508,7 +508,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
"COPY",
false,
0,
- 0,
+ 0,
true),
HOWTO (R_ALPHA_GLOB_DAT,
@@ -522,7 +522,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
"GLOB_DAT",
false,
0,
- 0,
+ 0,
true),
HOWTO (R_ALPHA_JMP_SLOT,
@@ -547,7 +547,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
0,
complain_overflow_dont,
bfd_elf_generic_reloc,
- "RELATIVE",
+ "RELATIVE",
false,
0,
0,
@@ -635,7 +635,7 @@ elf64_alpha_reloc_gpdisp (abfd, reloc_entry, sym, data, input_section,
reloc_entry->address + reloc_entry->addend > input_section->_cooked_size)
return bfd_reloc_outofrange;
- /* The gp used in the portion of the output object to which this
+ /* The gp used in the portion of the output object to which this
input object belongs is cached on the input bfd. */
gp = _bfd_get_gp_value (abfd);
@@ -743,7 +743,7 @@ elf64_alpha_reloc_op_store (abfd, reloc_entry, sym, data, input_section,
value = bfd_get_64 (abfd, data + reloc_entry->address);
value &= ~((((bfd_vma)1 << size) - 1) << offset);
- value |= (elf64_alpha_op_stack[--elf64_alpha_op_tos]
+ value |= (elf64_alpha_op_stack[--elf64_alpha_op_tos]
& (((bfd_vma)1 << size) - 1)) << offset;
bfd_put_64 (abfd, value, data + reloc_entry->address);
@@ -836,14 +836,14 @@ static const struct elf_reloc_map elf64_alpha_reloc_map[] =
{BFD_RELOC_64, R_ALPHA_REFQUAD},
{BFD_RELOC_CTOR, R_ALPHA_REFQUAD},
{BFD_RELOC_GPREL32, R_ALPHA_GPREL32},
- {BFD_RELOC_ALPHA_LITERAL, R_ALPHA_LITERAL},
+ {BFD_RELOC_ALPHA_ELF_LITERAL, R_ALPHA_LITERAL},
{BFD_RELOC_ALPHA_LITUSE, R_ALPHA_LITUSE},
{BFD_RELOC_ALPHA_GPDISP, R_ALPHA_GPDISP},
- {BFD_RELOC_23_PCREL_S2, R_ALPHA_BRADDR},
- {BFD_RELOC_ALPHA_HINT, R_ALPHA_HINT},
- {BFD_RELOC_16_PCREL, R_ALPHA_SREL16},
- {BFD_RELOC_32_PCREL, R_ALPHA_SREL32},
- {BFD_RELOC_64_PCREL, R_ALPHA_SREL64},
+ {BFD_RELOC_23_PCREL_S2, R_ALPHA_BRADDR},
+ {BFD_RELOC_ALPHA_HINT, R_ALPHA_HINT},
+ {BFD_RELOC_16_PCREL, R_ALPHA_SREL16},
+ {BFD_RELOC_32_PCREL, R_ALPHA_SREL32},
+ {BFD_RELOC_64_PCREL, R_ALPHA_SREL64},
#if 0
{BFD_RELOC_ALPHA_OP_PUSH, R_ALPHA_OP_PUSH},
{BFD_RELOC_ALPHA_OP_STORE, R_ALPHA_OP_STORE},
@@ -1435,7 +1435,7 @@ elf64_alpha_output_extsym (h, data)
else
{
name = bfd_section_name (output_section->owner, output_section);
-
+
if (strcmp (name, ".text") == 0)
h->esym.asym.sc = scText;
else if (strcmp (name, ".data") == 0)
@@ -1501,7 +1501,7 @@ elf64_alpha_output_extsym (h, data)
#if 0 /* FIXME? */
h->esym.ifd = 0;
#endif
- }
+ }
if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
h->root.root.root.string,
@@ -1572,17 +1572,17 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
case R_ALPHA_LITERAL:
/* If this is a load of a function symbol and we are building a
shared library or calling a shared library, then we need a
- .plt entry as well.
+ .plt entry as well.
We can tell if it is a function either by noticing the
type of the symbol, or, if the type is undefined, by
noticing that we have a LITUSE(3) reloc next.
Note that it is not fatal to be wrong guessing that a symbol
- is an object, but it is fatal to be wrong guessing that a
+ is an object, but it is fatal to be wrong guessing that a
symbol is a function.
- Furthermore, the .plt trampoline does not give constant
+ Furthermore, the .plt trampoline does not give constant
function addresses, so if we ever see a function's address
taken, we cannot do lazy binding on that function. */
@@ -1605,7 +1605,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
h->flags |= ALPHA_ELF_LINK_HASH_LU_ADDR;
if (h->root.root.type != bfd_link_hash_undefweak
- && (info->shared
+ && (info->shared
|| !(h->root.elf_link_hash_flags
& ELF_LINK_HASH_DEF_REGULAR))
&& (h->root.type == STT_FUNC
@@ -1750,11 +1750,11 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
{
bfd *dynobj;
asection *s;
-
+
dynobj = elf_hash_table(info)->dynobj;
/* If this is a function, put it in the procedure linkage table. We
- will fill in the contents of the procedure linkage table later,
+ will fill in the contents of the procedure linkage table later,
though we could actually do it here. */
if (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
@@ -1936,6 +1936,18 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
fiddle with dynstr_index. */
}
}
+
+ /* For now, bitch a lot if we exceed the .got size limit. We
+ should eventually allocate multiple independent .got
+ subsections as necessary. */
+ if (s->_raw_size > 64*1024)
+ {
+ (*_bfd_error_handler)
+ ("%s: .got segment overflow (size %lu, max %lu)",
+ bfd_get_filename (output_bfd), s->_raw_size, 64*1024);
+ bfd_set_error (bfd_error_file_too_big);
+ return false;
+ }
}
else if (strcmp (name, ".plt") != 0)
{
@@ -2273,7 +2285,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
}
/* overflow handled by _bfd_final_link_relocate */
goto default_reloc;
-
+
case R_ALPHA_GPREL32:
BFD_ASSERT(gp != 0);
relocation -= gp;
@@ -2285,11 +2297,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
the instruction rather than the end. */
addend -= 4;
goto default_reloc;
-
+
case R_ALPHA_REFLONG:
case R_ALPHA_REFQUAD:
if (info->shared
- || (h && !(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
+ || (h && !(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
+ /* Undef weak symbols in static executables shouldn't
+ trigger a dynamic reloc. */
+ && elf_hash_table(info)->dynamic_sections_created))
{
asection *srel;
const char *name;
@@ -2401,7 +2416,7 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
BFD_ASSERT(sgot != NULL);
got_addr = (sgot->output_section->vma
- + sgot->output_offset
+ + sgot->output_offset
+ h->got_offset);
plt_addr = (splt->output_section->vma
+ splt->output_offset
@@ -2422,7 +2437,7 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
insn1 = PLT_ENTRY_WORD1 | (hi & 0xffff);
insn2 = PLT_ENTRY_WORD2 | (lo & 0xffff);
insn3 = PLT_ENTRY_WORD3 | ((-(h->plt_offset + 12) >> 2) & 0x1fffff);
-
+
bfd_put_32 (output_bfd, insn1, splt->contents + h->plt_offset);
bfd_put_32 (output_bfd, insn2, splt->contents + h->plt_offset + 4);
bfd_put_32 (output_bfd, insn3, splt->contents + h->plt_offset + 8);
@@ -2534,8 +2549,8 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
case DT_RELASZ:
/* My interpretation of the TIS v1.1 ELF document indicates
that RELASZ should not include JMPREL. This is not what
- the rest of the BFD does. It is, however, what the
- glibc ld.so wants. Do this fixup here until we found
+ the rest of the BFD does. It is, however, what the
+ glibc ld.so wants. Do this fixup here until we found
out who is right. */
s = bfd_get_section_by_name (output_bfd, ".rela.plt");
if (s)
@@ -2567,12 +2582,12 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
bfd_put_32 (output_bfd, PLT_HEADER_WORD2, splt->contents + 4);
bfd_put_32 (output_bfd, PLT_HEADER_WORD3, splt->contents + 8);
bfd_put_32 (output_bfd, PLT_HEADER_WORD4, splt->contents + 12);
-
+
/* The next two words will be filled in by ld.so */
bfd_put_64 (output_bfd, 0, splt->contents + 16);
bfd_put_64 (output_bfd, 0, splt->contents + 24);
- elf_section_data (splt->output_section)->this_hdr.sh_entsize =
+ elf_section_data (splt->output_section)->this_hdr.sh_entsize =
PLT_HEADER_SIZE;
}
}
@@ -2589,7 +2604,7 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
sdyn->output_section->vma + sdyn->output_offset,
sgot->contents);
- elf_section_data (sgot->output_section)->this_hdr.sh_entsize =
+ elf_section_data (sgot->output_section)->this_hdr.sh_entsize =
8 * RESERVED_GOT_ENTRIES;
}
@@ -2801,7 +2816,7 @@ elf64_alpha_final_link (abfd, info)
}
else
esym.asym.value = last;
-
+
if (! bfd_ecoff_debug_one_external (abfd, &debug, swap,
name[i], &esym))
return false;
@@ -3292,7 +3307,7 @@ elf64_alpha_ecoff_debug_swap =
elf64_alpha_info_to_howto
#define elf_backend_object_p \
- elf64_alpha_object_p
+ elf64_alpha_object_p
#define elf_backend_section_from_shdr \
elf64_alpha_section_from_shdr
#define elf_backend_fake_sections \
diff --git a/gnu/usr.bin/binutils/bfd/evax-alpha.c b/gnu/usr.bin/binutils/bfd/evax-alpha.c
index 20a5a979fd2..a13ae6eb97e 100644
--- a/gnu/usr.bin/binutils/bfd/evax-alpha.c
+++ b/gnu/usr.bin/binutils/bfd/evax-alpha.c
@@ -196,7 +196,6 @@ evax_initialize (abfd)
PRIV(buf_size) = 0;
PRIV(rec_length) = 0;
PRIV(file_format) = FF_UNKNOWN;
- PRIV(filename) = NULL;
PRIV(fixup_done) = false;
PRIV(sections) = NULL;
@@ -530,12 +529,6 @@ evax_close_and_cleanup (abfd)
}
PRIV(buf_size) = 0;
- if (PRIV(filename) != NULL)
- {
- free (PRIV(filename));
- PRIV(filename) = NULL;
- }
-
if (PRIV(output_buf) != 0)
{
free (PRIV(output_buf));
@@ -1010,9 +1003,9 @@ evax_get_symtab (abfd, symbols)
PRIV(symcache) = symbols;
bfd_hash_traverse(PRIV(evax_symbol_table), copy_symbols, (PTR)abfd);
- symbols[bfd_get_symcount(abfd)] = NULL;
+ symbols[PRIV(egsd_sym_count)] = NULL;
- return bfd_get_symcount(abfd);
+ return PRIV(egsd_sym_count);
}
diff --git a/gnu/usr.bin/binutils/bfd/evax-egsd.c b/gnu/usr.bin/binutils/bfd/evax-egsd.c
index f5275a98567..f766ecb7391 100644
--- a/gnu/usr.bin/binutils/bfd/evax-egsd.c
+++ b/gnu/usr.bin/binutils/bfd/evax-egsd.c
@@ -318,11 +318,12 @@ _bfd_evax_slurp_egsd (abfd)
}
else /* symbol reference */
{
-#if EVAX_DEBUG
- evax_debug(3, "egsd sym ref #%d (%s, %04x=%s)\n", abfd->symcount, evax_rec+9, old_flags, flag2str(gsyflagdesc, old_flags));
-#endif
symbol->name =
_bfd_evax_save_counted_string ((char *)evax_rec+8);
+#if EVAX_DEBUG
+ evax_debug(3, "egsd sym ref #%d (%s, %04x=%s)\n", abfd->symcount,
+ symbol->name, old_flags, flag2str(gsyflagdesc, old_flags));
+#endif
symbol->section = bfd_make_section (abfd, BFD_UND_SECTION_NAME);
}
@@ -496,6 +497,9 @@ _bfd_evax_write_egsd (abfd)
}
old_flags = symbol->flags;
+ if (old_flags & BSF_FILE)
+ continue;
+
if (((old_flags & BSF_GLOBAL) == 0) /* not xdef */
&& (!bfd_is_und_section (symbol->section))) /* and not xref */
continue; /* dont output */
@@ -551,24 +555,7 @@ _bfd_evax_write_egsd (abfd)
_bfd_evax_output_long (abfd, symbol->section->index);/* L_PSINDX, FIXME */
}
}
- if (strlen ((char *)symbol->name) > 198)
- {
- (*_bfd_error_handler) ("Name '%s' too long\n", symbol->name);
- abort ();
- }
- nptr = (char *)symbol->name;
- uptr = uname;
- while (*nptr)
- {
- if (islower (*nptr))
- *uptr = toupper (*nptr);
- else
- *uptr = *nptr;
- uptr++;
- nptr++;
- }
- *uptr = 0;
- _bfd_evax_output_counted (abfd, uname);
+ _bfd_evax_output_counted (abfd, _bfd_evax_case_hack_symbol (abfd, symbol->name));
_bfd_evax_output_flush (abfd);
diff --git a/gnu/usr.bin/binutils/bfd/evax-emh.c b/gnu/usr.bin/binutils/bfd/evax-emh.c
index 69f7e0be91b..b59023b5a48 100644
--- a/gnu/usr.bin/binutils/bfd/evax-emh.c
+++ b/gnu/usr.bin/binutils/bfd/evax-emh.c
@@ -124,13 +124,62 @@ _bfd_evax_slurp_emh (abfd)
}
+/*-----------------------------------------------------------------------------*/
+/* Output routines. */
+
+
+/* Manufacure a VMS like time on a unix based system.
+ stolen from obj-vms.c */
+
+static unsigned char *
+get_vms_time_string ()
+{
+ static unsigned char tbuf[18];
+#ifndef VMS
+#include <sys/types.h>
+#include <time.h>
+
+ char *pnt;
+ time_t timeb;
+ time (&timeb);
+ pnt = ctime (&timeb);
+ pnt[3] = 0;
+ pnt[7] = 0;
+ pnt[10] = 0;
+ pnt[16] = 0;
+ pnt[24] = 0;
+ sprintf (tbuf, "%2s-%3s-%s %s", pnt + 8, pnt + 4, pnt + 20, pnt + 11);
+#else
+#include <starlet.h>
+ struct
+ {
+ int Size;
+ unsigned char *Ptr;
+ } Descriptor;
+ Descriptor.Size = 17;
+ Descriptor.Ptr = tbuf;
+ sys$asctim (0, &Descriptor, 0, 0);
+#endif /* not VMS */
+
+#if EVAX_DEBUG
+ evax_debug (6, "vmstimestring:'%s'\n", tbuf);
+#endif
+
+ return tbuf;
+}
+
+
/* write object header for bfd abfd */
int
_bfd_evax_write_emh (abfd)
bfd *abfd;
{
- char *name;
+ asymbol *symbol;
+ int symnum;
+ int had_case = 0;
+ int had_file = 0;
+
#if EVAX_DEBUG
evax_debug (2, "evax_write_emh(%p)\n", abfd);
@@ -145,16 +194,14 @@ _bfd_evax_write_emh (abfd)
_bfd_evax_output_long (abfd, 0);
_bfd_evax_output_long (abfd, 0);
_bfd_evax_output_long (abfd, MAX_OUTREC_SIZE);
- if (bfd_get_filename (abfd) != NULL)
- {
- name = strdup (bfd_get_filename (abfd));
- _bfd_evax_output_counted (abfd, _bfd_evax_basename (name));
- }
+
+ if (bfd_get_filename (abfd) != 0)
+ _bfd_evax_output_counted (abfd, bfd_get_filename (abfd));
else
_bfd_evax_output_counted (abfd, "NONAME");
+
_bfd_evax_output_counted (abfd, BFD_VERSION);
- _bfd_evax_output_dump (abfd, (unsigned char *)_bfd_get_vms_time_string (),
- 17);
+ _bfd_evax_output_dump (abfd, get_vms_time_string (), 17);
_bfd_evax_output_fill (abfd, 0, 17);
_bfd_evax_output_flush (abfd);
@@ -167,10 +214,38 @@ _bfd_evax_write_emh (abfd)
/* SRC */
_bfd_evax_output_begin (abfd, EOBJ_S_C_EMH, EMH_S_C_SRC);
- if (PRIV(filename) != 0)
- _bfd_evax_output_dump (abfd, (unsigned char *)PRIV(filename), strlen (PRIV(filename)));
- else
- _bfd_evax_output_dump (abfd, (unsigned char *)"noname", 6);
+
+ for (symnum = 0; symnum < abfd->symcount; symnum++)
+ {
+ symbol = abfd->outsymbols[symnum];
+
+ if (symbol->flags & BSF_FILE)
+ {
+ char *s;
+
+ if (strncmp ((char *)symbol->name, "<CASE:", 6) == 0)
+ {
+ PRIV(flag_hash_long_names) = symbol->name[6] - '0';
+ PRIV(flag_show_after_trunc) = symbol->name[7] - '0';
+ PRIV(flag_no_hash_mixed_case) = symbol->name[8] - '0';
+ PRIV(vms_name_mapping) = symbol->name[9] - '0';
+
+ if (had_file)
+ break;
+ had_case = 1;
+ continue;
+ }
+
+ _bfd_evax_output_dump (abfd, (char *)symbol->name, strlen (symbol->name));
+ if (had_case)
+ break;
+ had_file = 1;
+ }
+ }
+
+ if (symnum == abfd->symcount)
+ _bfd_evax_output_dump (abfd, "noname", 6);
+
_bfd_evax_output_flush (abfd);
/* TTL */
diff --git a/gnu/usr.bin/binutils/bfd/evax-etir.c b/gnu/usr.bin/binutils/bfd/evax-etir.c
index cb186f11e96..067af829bb9 100644
--- a/gnu/usr.bin/binutils/bfd/evax-etir.c
+++ b/gnu/usr.bin/binutils/bfd/evax-etir.c
@@ -1121,8 +1121,6 @@ _bfd_evax_write_etir (abfd)
asection *section;
evax_section *sptr;
int nextoffset;
- char uname[200];
- char *nptr, *uptr;
#if EVAX_DEBUG
evax_debug (2, "evax_write_etir(%p)\n", abfd);
@@ -1247,19 +1245,8 @@ _bfd_evax_write_etir (abfd)
_bfd_evax_output_begin (abfd,
ETIR_S_C_STO_GBL_LW,
-1);
- uptr = uname;
- nptr = (char *)sym->name;
- while (*nptr)
- {
- if (islower (*nptr))
- *uptr = toupper (*nptr);
- else
- *uptr = *nptr;
- nptr++;
- uptr++;
- }
- *uptr = 0;
- _bfd_evax_output_counted (abfd, uname);
+ _bfd_evax_output_counted (abfd,
+ _bfd_evax_case_hack_symbol (abfd, sym->name));
_bfd_evax_output_flush (abfd);
}
else if (bfd_is_abs_section (sym->section))
@@ -1324,19 +1311,8 @@ _bfd_evax_write_etir (abfd)
_bfd_evax_output_begin (abfd,
ETIR_S_C_STO_GBL,
-1);
- uptr = uname;
- nptr = (char *)sym->name;
- while (*nptr)
- {
- if (islower (*nptr))
- *uptr = toupper (*nptr);
- else
- *uptr = *nptr;
- nptr++;
- uptr++;
- }
- *uptr = 0;
- _bfd_evax_output_counted (abfd, uname);
+ _bfd_evax_output_counted (abfd,
+ _bfd_evax_case_hack_symbol (abfd, sym->name));
_bfd_evax_output_flush (abfd);
}
else if (bfd_is_abs_section (sym->section))
@@ -1397,20 +1373,8 @@ _bfd_evax_write_etir (abfd)
evax_output_begin(abfd, ETIR_S_C_STO_HINT_GBL, -1);
evax_output_long(abfd, (unsigned long)(sec->index));
evax_output_quad(abfd, (uquad)addr);
- uptr = uname;
- nptr = (char *)(*(*rptr)->sym_ptr_ptr)->name;
- while (*nptr)
- {
- if (islower (*nptr))
- *uptr = toupper (*nptr);
- else
- *uptr = *nptr;
- nptr++;
- uptr++;
- }
- *uptr = 0;
- evax_output_counted(abfd, uname);
+ evax_output_counted(abfd, _bfd_evax_case_hack_symbol (abfd, sym->name));
evax_output_flush(abfd);
#endif
}
@@ -1447,19 +1411,8 @@ _bfd_evax_write_etir (abfd)
_bfd_evax_output_long (abfd,
(unsigned long)PRIV(evax_linkage_index));
PRIV(evax_linkage_index) += 2;
- uptr = uname;
- nptr = (char *)(*(*rptr)->sym_ptr_ptr)->name;
- while (*nptr)
- {
- if (islower (*nptr))
- *uptr = toupper (*nptr);
- else
- *uptr = *nptr;
- nptr++;
- uptr++;
- }
- *uptr = 0;
- _bfd_evax_output_counted (abfd, uname);
+ _bfd_evax_output_counted (abfd,
+ _bfd_evax_case_hack_symbol (abfd, sym->name));
_bfd_evax_output_byte (abfd, 0);
_bfd_evax_output_flush (abfd);
}
diff --git a/gnu/usr.bin/binutils/bfd/evax-misc.c b/gnu/usr.bin/binutils/bfd/evax-misc.c
index 3da89997805..ce72ea4fa34 100644
--- a/gnu/usr.bin/binutils/bfd/evax-misc.c
+++ b/gnu/usr.bin/binutils/bfd/evax-misc.c
@@ -565,7 +565,7 @@ add_new_contents (abfd, section)
newptr = (evax_section *) bfd_malloc (sizeof (evax_section));
if (newptr == (evax_section *) NULL)
return NULL;
- newptr->contents = (unsigned char *) bfd_alloc (abfd, section->_raw_size);
+ newptr->contents = (unsigned char *) bfd_alloc (abfd, (int)section->_raw_size);
if (newptr->contents == (unsigned char *)NULL)
return NULL;
newptr->offset = 0;
@@ -952,98 +952,195 @@ _bfd_evax_output_fill (abfd, value, count)
return;
}
-/*-----------------------------------------------------------------------------*/
+/* this hash routine borrowed from GNU-EMACS, and strengthened slightly ERY*/
-/* Return basename (stripped of directory information) of filename */
+static int
+hash_string (ptr)
+ const char *ptr;
+{
+ register const unsigned char *p = (unsigned char *) ptr;
+ register const unsigned char *end = p + strlen (ptr);
+ register unsigned char c;
+ register int hash = 0;
+ while (p != end)
+ {
+ c = *p++;
+ hash = ((hash << 3) + (hash << 15) + (hash >> 28) + c);
+ }
+ return hash;
+}
+
+/* Generate a Case-Hacked VMS symbol name (limited to 64 chars). */
char *
-_bfd_evax_basename (name)
- char *name;
+_bfd_evax_case_hack_symbol (abfd, in)
+ bfd *abfd;
+ const char *in;
{
- char *ptr;
+ long int init;
+ long int result;
+ char *pnt = 0;
+ char *new_name;
+ const char *old_name;
+ int i;
+ int destructor = 0; /*hack to allow for case sens in a destructor*/
+ int truncate = 0;
+ int case_hack_bits = 0;
+ int saw_dollar = 0;
+ static char hex_table[16] =
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+ static char outbuf[65];
+ char *out = outbuf;
#if EVAX_DEBUG
- evax_debug (6, "_bfd_evax_basename %s -> ", name);
+ evax_debug(4, "_bfd_evax_case_hack_symbol \"%s\"\n", in);
#endif
-#ifndef VMS
- /* assume unix host */
- ptr = strrchr (name, '.');
- if (ptr)
- *ptr = 0;
- ptr = strrchr (name, '/');
- if (ptr)
- *ptr++ = 0;
- else
- ptr = name;
-#else
- /* assume vms host */
- ptr = strrchr (name, '.');
- if (ptr)
- {
- *ptr = 0;
- ptr = name;
- }
- else
+#if 0
+ /* Kill any leading "_". */ /* Why ? FIXME ! */
+
+ if ((in[0] == '_') && ((in[1] > '9') || (in[1] < '0')))
+ in++;
+#endif
+
+ new_name = out; /* save this for later. */
+
+ /* We may need to truncate the symbol, save the hash for later. */
+
+ result = (strlen (in) > 56) ? hash_string (in) : 0;
+
+ old_name = in;
+
+ /* Do the case conversion. */
+
+ i = 56; /* Maximum of 56 chars */
+
+ while (*in && (--i >= 0))
{
- ptr = strrchr (name, ']');
- if (ptr)
- *ptr++ = 0;
- else
+ case_hack_bits <<= 1;
+ if (*in == '$')
+ saw_dollar = 1;
+ if ((destructor == 1) && (i == 54))
+ saw_dollar = 0;
+ switch (PRIV(vms_name_mapping))
{
- ptr = strrchr (name, ':');
- if (ptr)
- *ptr++ = 0;
- else
- ptr = name;
+ case 0:
+ if (isupper (*in)) {
+ *out++ = *in++;
+ case_hack_bits |= 1;
+ } else {
+ *out++ = islower (*in) ? toupper (*in++) : *in++;
+ }
+ break;
+ case 3: *out++ = *in++;
+ break;
+ case 2:
+ if (islower (*in)) {
+ *out++ = *in++;
+ } else {
+ *out++ = isupper (*in) ? tolower (*in++) : *in++;
+ }
+ break;
}
}
-#endif
-#if EVAX_DEBUG
- evax_debug (6, "%s\n", ptr);
-#endif
+ /* if we saw a dollar sign, we don't do case hacking. */
+
+ if (PRIV(flag_no_hash_mixed_case) || saw_dollar)
+ case_hack_bits = 0;
- return ptr;
+ /* if we have more than 56 characters and everything is lowercase
+ we can insert the full 64 characters. */
+
+ if (*in)
+ {
+ /* We have more than 56 characters
+ If we must add the case hack, then we have truncated the str. */
+ pnt = out;
+ truncate = 1;
+ if (case_hack_bits == 0)
+ {
+ /* And so far they are all lower case:
+ Check up to 8 more characters
+ and ensure that they are lowercase. */
+
+ for (i = 0; (in[i] != 0) && (i < 8); i++)
+ if (isupper (in[i]) && !saw_dollar && !PRIV(flag_no_hash_mixed_case))
+ break;
+
+ if (in[i] == 0)
+ truncate = 0;
+
+ if ((i == 8) || (in[i] == 0))
+ {
+ /* They are: Copy up to 64 characters
+ to the output string. */
+
+ i = 8;
+ while ((--i >= 0) && (*in))
+ {
+ switch (PRIV(vms_name_mapping))
+ {
+ case 0:
+ *out++ = islower (*in) ? toupper (*in++) : *in++;
+ break;
+ case 3:
+ *out++ = *in++;
+ break;
+ case 2:
+ *out++ = isupper (*in) ? tolower (*in++) : *in++;
+ break;
+ }
+ }
+ }
+ }
}
+ /* If there were any uppercase characters in the name we
+ take on the case hacking string. */
-/* Manufacure a VMS like time on a unix based system.
- stolen from obj-vms.c */
+ /* Old behavior for regular GNU-C compiler */
-char *
-_bfd_get_vms_time_string ()
-{
- static char tbuf[18];
-#ifndef VMS
-#include <sys/types.h>
-#include <time.h>
-
- char *pnt;
- time_t timeb;
- time (&timeb);
- pnt = ctime (&timeb);
- pnt[3] = 0;
- pnt[7] = 0;
- pnt[10] = 0;
- pnt[16] = 0;
- pnt[24] = 0;
- sprintf (tbuf, "%2s-%3s-%s %s", pnt + 8, pnt + 4, pnt + 20, pnt + 11);
-#else
-#include <starlet.h>
- struct
- {
- int Size;
- char *Ptr;
- } Descriptor;
- Descriptor.Size = 17;
- Descriptor.Ptr = tbuf;
- sys$asctim (0, &Descriptor, 0, 0);
-#endif /* not VMS */
+ if (!PRIV(flag_hash_long_names))
+ truncate = 0;
+
+ if ((case_hack_bits != 0) || (truncate == 1))
+ {
+ if (truncate == 0)
+ {
+ *out++ = '_';
+ for (i = 0; i < 6; i++)
+ {
+ *out++ = hex_table[case_hack_bits & 0xf];
+ case_hack_bits >>= 4;
+ }
+ *out++ = 'X';
+ }
+ else
+ {
+ out = pnt; /* Cut back to 56 characters maximum */
+ *out++ = '_';
+ for (i = 0; i < 7; i++)
+ {
+ init = result & 0x01f;
+ *out++ = (init < 10) ? ('0' + init) : ('A' + init - 10);
+ result = result >> 5;
+ }
+ }
+ }
+
+ *out = 0;
#if EVAX_DEBUG
- evax_debug (6, "vmstimestring:'%s'\n", tbuf);
+ evax_debug(4, "--> [%d]\"%s\"\n", strlen (outbuf), outbuf);
#endif
- return tbuf;
+ if (truncate == 1
+ && PRIV(flag_hash_long_names)
+ && PRIV(flag_show_after_trunc))
+ printf ("Symbol %s replaced by %s\n", old_name, new_name);
+
+ return outbuf;
}
+
diff --git a/gnu/usr.bin/binutils/bfd/evax.h b/gnu/usr.bin/binutils/bfd/evax.h
index 7d6c9b4ec42..be627657cc1 100644
--- a/gnu/usr.bin/binutils/bfd/evax.h
+++ b/gnu/usr.bin/binutils/bfd/evax.h
@@ -279,7 +279,6 @@ struct location_struct {
#define EVAX_SECTION_COUNT 32
struct evax_private_data_struct {
- char *filename; /* Filename of object file */
boolean fixup_done; /* Flag to indicate if all
section pointers and PRIV(sections)
are set up correctly */
@@ -328,6 +327,11 @@ struct evax_private_data_struct {
int evax_linkage_index;
+ /* see tc-alpha.c of gas for a description. */
+ int flag_hash_long_names; /* -+ */
+ int flag_show_after_trunc; /* -H */
+ int flag_no_hash_mixed_case; /* -h NUM */
+ char vms_name_mapping;
};
#define PRIV(name) ((struct evax_private_data_struct *)abfd->tdata.any)->name
@@ -373,7 +377,6 @@ extern void _bfd_evax_output_counted PARAMS ((bfd *abfd, char *value));
extern void _bfd_evax_output_dump PARAMS ((bfd *abfd, unsigned char *data,
int length));
extern void _bfd_evax_output_fill PARAMS ((bfd *abfd, int value, int length));
-extern char *_bfd_get_vms_time_string PARAMS ((void));
-extern char *_bfd_evax_basename PARAMS ((char *name));
+extern char *_bfd_evax_case_hack_symbol PARAMS ((bfd *abfd, const char *in));
#endif /* EVAX_H */
diff --git a/gnu/usr.bin/binutils/bfd/freebsd.h b/gnu/usr.bin/binutils/bfd/freebsd.h
index 7e1d69d0df7..ccd201f1af7 100644
--- a/gnu/usr.bin/binutils/bfd/freebsd.h
+++ b/gnu/usr.bin/binutils/bfd/freebsd.h
@@ -25,11 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define TEXT_START_ADDR 0
#define N_GETMAGIC_NET(exec) \
- (ntohl ((exec).a_info) & 0xffff)
+ ((exec).a_info & 0xffff)
#define N_GETMID_NET(exec) \
- ((ntohl ((exec).a_info) >> 16) & 0x3ff)
+ (((exec).a_info >> 16) & 0x3ff)
#define N_GETFLAG_NET(ex) \
- ((ntohl ((exec).a_info) >> 26) & 0x3f)
+ (((exec).a_info >> 26) & 0x3f)
#define N_MACHTYPE(exec) \
((enum machine_type) \
@@ -55,8 +55,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "libbfd.h"
#include "libaout.h"
-/* On FreeBSD, the magic number is always in correct endian format */
-#define NO_SWAP_MAGIC
+/* On FreeBSD, the magic number is always in ntohl's "network" (big-endian)
+ format. I think. */
+#define SWAP_MAGIC(ext) bfd_getb32 (ext)
#define MY_write_object_contents MY(write_object_contents)
diff --git a/gnu/usr.bin/binutils/bfd/hosts/i386bsd.h b/gnu/usr.bin/binutils/bfd/hosts/i386bsd.h
index ac0d8402edb..8eee3d82fb7 100644
--- a/gnu/usr.bin/binutils/bfd/hosts/i386bsd.h
+++ b/gnu/usr.bin/binutils/bfd/hosts/i386bsd.h
@@ -3,6 +3,13 @@
#include <machine/param.h>
#include <machine/vmparam.h>
+/* Recent versions of FreeBSD don't define NBPG. */
+#ifndef NBPG
+#ifdef PAGE_SIZE
+#define NBPG PAGE_SIZE
+#endif
+#endif
+
#define HOST_PAGE_SIZE NBPG
#define HOST_MACHINE_ARCH bfd_arch_i386
#define HOST_TEXT_START_ADDR USRTEXT
diff --git a/gnu/usr.bin/binutils/bfd/netbsd-core.c b/gnu/usr.bin/binutils/bfd/netbsd-core.c
index e11100d87b4..40500e8f707 100644
--- a/gnu/usr.bin/binutils/bfd/netbsd-core.c
+++ b/gnu/usr.bin/binutils/bfd/netbsd-core.c
@@ -46,6 +46,7 @@ static char * netbsd_core_core_file_failing_command PARAMS ((bfd *abfd));
static int netbsd_core_core_file_failing_signal PARAMS ((bfd *abfd));
static boolean netbsd_core_core_file_matches_executable_p
PARAMS ((bfd *core_bfd, bfd *exec_bfd));
+static void swap_abort PARAMS ((void));
/* Handle NetBSD-style core dump file. */
diff --git a/gnu/usr.bin/binutils/binutils/makefile.vms b/gnu/usr.bin/binutils/binutils/makefile.vms
index a3b0d60985e..557e3af1805 100644
--- a/gnu/usr.bin/binutils/binutils/makefile.vms
+++ b/gnu/usr.bin/binutils/binutils/makefile.vms
@@ -61,7 +61,7 @@ objdump.exe: $(OBJDUMPOBJS)
version.obj: version.c
- $(CC) $(CFLAGS)/define=(VERSION="""960723""") $<
+ $(CC) $(CFLAGS)/define=(VERSION="""960814""") $<
config.h: config.h-vms
$(CP) $< $@
diff --git a/gnu/usr.bin/binutils/binutils/size.c b/gnu/usr.bin/binutils/binutils/size.c
index cf460574514..de30d9da6b0 100644
--- a/gnu/usr.bin/binutils/binutils/size.c
+++ b/gnu/usr.bin/binutils/binutils/size.c
@@ -1,5 +1,5 @@
/* size.c -- report size of various sections of an executable file.
- Copyright 1991, 92, 93, 94 Free Software Foundation, Inc.
+ Copyright 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@ -51,7 +51,6 @@ int show_help = 0;
int return_code = 0;
/* IMPORTS */
-extern char *program_version;
extern char *target;
/* Forward declarations */
@@ -76,6 +75,8 @@ Usage: %s [-ABdoxV] [--format=berkeley|sysv] [--radix=8|10|16]\n\
fputs ("default is --format=sysv\n", stream);
#endif
list_supported_targets (program_name, stream);
+ if (status == 0)
+ fprintf (stream, "Report bugs to bug-gnu-utils@prep.ai.mit.edu\n");
exit (status);
}
@@ -175,10 +176,7 @@ main (argc, argv)
}
if (show_version)
- {
- printf ("GNU %s version %s\n", program_name, program_version);
- exit (0);
- }
+ print_version ("size");
if (show_help)
usage (stdout, 0);
diff --git a/gnu/usr.bin/binutils/binutils/version.c b/gnu/usr.bin/binutils/binutils/version.c
index 5a19113953e..c2a793d00db 100644
--- a/gnu/usr.bin/binutils/binutils/version.c
+++ b/gnu/usr.bin/binutils/binutils/version.c
@@ -1,5 +1,43 @@
-/*** version.c -- version number for binutils.
- They all change in lockstep -- it's easier that way
-*/
+/* version.c -- binutils version information
+ Copyright 1991, 1996 Free Software Foundation, Inc.
-char *program_version = VERSION;
+This file is part of GNU Binutils.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stdio.h>
+#include "bfd.h"
+#include "bucomm.h"
+
+/* This is the version numbers for the binutils. They all change in
+ lockstep -- it's easier that way. */
+
+const char *program_version = VERSION;
+
+/* Print the version number and copyright information, and exit. This
+ implements the --version option for the various programs. */
+
+void
+print_version (name)
+ const char *name;
+{
+ /* This output is intended to follow the GNU standards document. */
+ printf ("GNU %s %s\n", name, program_version);
+ printf ("Copyright 1996 Free Software Foundation, Inc.\n");
+ printf ("\
+This program is free software; you may redistribute it under the terms of\n\
+the GNU General Public License. This program has absolutely no warranty.\n");
+ exit (0);
+}
diff --git a/gnu/usr.bin/binutils/config/mpw/ChangeLog b/gnu/usr.bin/binutils/config/mpw/ChangeLog
index 242ad0ffed0..9517a368ef3 100644
--- a/gnu/usr.bin/binutils/config/mpw/ChangeLog
+++ b/gnu/usr.bin/binutils/config/mpw/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 16 14:42:52 1996 Stan Shebs <shebs@andros.cygnus.com>
+
+ * g-mpw-make.sed (HLDENV): Edit out all references.
+
Thu Aug 15 19:49:23 1996 Stan Shebs <shebs@andros.cygnus.com>
* true: New script, identical to mpw-true.
diff --git a/gnu/usr.bin/binutils/config/mpw/g-mpw-make.sed b/gnu/usr.bin/binutils/config/mpw/g-mpw-make.sed
index 201196306a0..8a2e666ad75 100644
--- a/gnu/usr.bin/binutils/config/mpw/g-mpw-make.sed
+++ b/gnu/usr.bin/binutils/config/mpw/g-mpw-make.sed
@@ -33,6 +33,9 @@
/=/s/ = \.$/ = :/
+# Make these go away so that later edits not confused.
+/HLDENV/s/{HLDENV}//
+
# Comment out any explicit srcdir setting.
/srcdir/s/^srcdir/# srcdir/
diff --git a/gnu/usr.bin/binutils/config/mt-ppc b/gnu/usr.bin/binutils/config/mt-ppc
deleted file mode 100644
index 148f897f430..00000000000
--- a/gnu/usr.bin/binutils/config/mt-ppc
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS_FOR_TARGET = $(CFLAGS) -mrelocatable-lib -mno-eabi
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -mrelocatable-lib -mno-eabi
diff --git a/gnu/usr.bin/binutils/etc/configure.in b/gnu/usr.bin/binutils/etc/configure.in
index c94a6237ba8..a29f9931ab1 100644
--- a/gnu/usr.bin/binutils/etc/configure.in
+++ b/gnu/usr.bin/binutils/etc/configure.in
@@ -1,17 +1,7 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory. For more information, check
-# any existing configure script.
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.5)
+AC_INIT(configure.texi)
-srctrigger=configure.texi
-srcname="general documentation"
+AC_PROG_INSTALL
-# per-host:
-
-# per-target:
-
-#
-# Local Variables:
-# fill-column: 131
-# End:
-#
+AC_OUTPUT(Makefile)
diff --git a/gnu/usr.bin/binutils/gas/README-quirks b/gnu/usr.bin/binutils/gas/README-quirks
deleted file mode 100644
index c9a3b05917a..00000000000
--- a/gnu/usr.bin/binutils/gas/README-quirks
+++ /dev/null
@@ -1,7 +0,0 @@
-* rcsid's should be conspicuously absent until someone explains to me
- how to use them constructively without affecting diffs from remote
- sites. If you can, then I will become an active supporter of
- rcsid's.
-
-* "diff -u" patches preferred. "diff -c" patches accepted. All other
- patches will be returned.
diff --git a/gnu/usr.bin/binutils/gas/README.coff b/gnu/usr.bin/binutils/gas/README.coff
deleted file mode 100644
index 46c61cda909..00000000000
--- a/gnu/usr.bin/binutils/gas/README.coff
+++ /dev/null
@@ -1,79 +0,0 @@
-The coff patches intend to do the following :
-
- . Generate coff files very compatible with vanilla linker.
- . Understands coff debug directives.
-
-Here are the guidelines of the work I have done :
-
- . Encapsulate format dependent code in macros where it is possible.
- . Where not possible differenciate with #ifdef
- . try not to change the calling conventions of the existing functions.
- I made one exception : symbol_new. I would be pleased to hear about
- a better solution. (symbols.c)
- . Extend the use of N_TYPE_seg seg_N_TYPE tables so that segments can
- be manipulated without using their format dependent name. (subsegs.c)
- . Write a function to parse the .def debug directives
- . Write two small peaces of code to handle the .ln directive.
- . In write.c try to move all the cross compilation specifics (md_..) to
- format dependent files.
- . Encapsulate the data structures using generic types, macros calls.
- . Added too much code to resolve the complexity of the symbol table
- generated. Most of the code deals with debug stuff.
- . Create another makefile, shorter, cleaner.
- . Create a config.gas shell script to mimic the gcc,gdb... configuration
- mechanism. This reduce the complexity of the makefile.
- . Isolate the format dependent code in two files
- coff.c coff.h
- aout.c aout.h
- elf.c elf.h [ Not yet ;-]
- . added a little stack management routine for coff in file stack.c
- . isolate os specific flags in m- files
-
-If further development is planed on it is should solve the following problems :
-
- . Encapsulate DESC & OTHER tests in a macro call. I'm not aware
- of their exact semantics.
- . Clean up the seg_N_TYPE N_TYPE_seg naming scheme
- . Try to remove as much reference to segment dependent names as possible
- . Find a cleaner solution for symbol_new.
- . Report the modifications on vax, ns32k, sparc machine dependent files.
- To acheive this goal, search for \<N_, sy_, symbol_new and symbolS.
- . Allow an arbitrary number of segments (spare sections .ctor .dtor .bletch)
- . Find a way to extend the debug information without breaking sdb
- compatibility. Mainly intended for G++.
- . should it do something to generate shared libraries objects ?
-
-I have tested this code on the following processor/os. gcc-1.37.1 was
- used for all the tests.
-
-386 SCO unix ODT
- gcc-1.37.1, gas, emacs-18.55
-
-386 Esix rev C
- gas-1.37/write.s
-
-386 Ix 2.02
- gas, all the X11R4 mit clients
-
-386 CTIX 3.2
- xsol (X11R4 solitary game), gas
-
-68030 unisoft 1.3
- the kernel (V.3.2) + tcp/ip extensions
- bash-1.05, bison-1.11, compress-4.0, cproto, shar-3.49, diff-1.14,
- dist-18.55, flex-2.3, gas-1.37, gcc-1.37.1, gdb-3.6, grep-1.5,
- kermit, make-3.58, makedep, patch, printf, makeinfo, g++-1.37.1,
- tar-1.08, texi2roff, uuencode, uutraf-1.2, libg++-1.37.2, groff-0.5
-
-68020 sunos 3.5 (no, not coff, just to be sure that I didn't
- introduce errors)
- gcc-1.37.1, gas, emacs-18.55, gdb-3.6, bison-1.11, diff-1.14,
- make-3.58, tar-1.08
-
-68030 sunos 4.0.3 (idem)
- gas
-
-I would be glad to hear about new experiences
-
- Loic (loic@adesign.uucp or loic@afp.uucp)
-
diff --git a/gnu/usr.bin/binutils/gas/README.rich b/gnu/usr.bin/binutils/gas/README.rich
deleted file mode 100644
index 1ac53c7cfd3..00000000000
--- a/gnu/usr.bin/binutils/gas/README.rich
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
- The Code Pedigree of This Directory
-
-
-This directory contains a big merge of several development lines of
-gas as well as a few bug fixes and some configuration that I've added
-in order to retain my own sanity.
-
-A little history.
-
-The only common baseline of all versions was gas-1.31.
-
-From 1.31, Intel branched off and added:
-
- support for the Intel 80960 (i960) processor.
- support for b.out object files.
- some bug fixes.
- sloppy mac MPW support
- Intel gnu/960 makefiles and version numbering.
-
-Many of the bug fixes found their way into the main development line
-prior to 1.36. ALL intel changes were ifdef'd I80960. This was good
-as it isolated the changes, but bad in that it connected the b.out
-support to the i960 support, and bad in that the bug fixes were only
-active in the i960+b.out executables of gas, (although most of these
-were nicely marked with comments indicating that they were probably
-general bug fixes.)
-
-To pick up the main FSF development line again, along the way to 1.36,
-several new processors were added, many bugs fixed, and the world was
-a somewhat better place in general.
-
-From gas-1.36, Loic at Axis Design (france!) encapsulated object
-format specific actions, added coff versions of those encapsulations,
-and a config.gas style configuration and Makefile. This was a big
-change and a lot of work.
-
-Then along came the FIRST FSF release of gas-1.37. I say this because
-there have been at least two releases of gas-1.37. Only two of them
-do we care about for this story, so let's call them gas-1.37.1 and
-gas-1.37.2.
-
-Here starts the confusion. Firstly, gas-1.37.1 did not compile.
-
-In the meantime, John Gilmore at Cygnus Support had been hacking
-gas-1.37.1. He got it to compile. He added support for the AMD 29000
-processor. AND he started encapsulating some of the a.out specific
-pieces of code mostly into functions. AND he rebuilt the relocation
-info to be generic. AND he restructured somewhat so that for a single
-host, cross assemblers could be built for all targets in the same
-directory. Useful work but a considerable nuisance because the a29k
-changes were not partitioned from the encapsulation changes, the
-encapsulation changes were incomplete, and the encapsulation required
-functions where alternate structuring might have used macros. Let's
-call this version gas-1.37.1+a29k.
-
-By the time gas-1.37.2 was "released", (remember that it TOO was
-labelled by FSF as gas-1.37), it compiled, but it also added i860
-support and ansi style const declarations.
-
-At this point, Loic rolled his changes into gas-1.37.2.
-
-What I've done.
-
-I collected all the stray versions of gas that sounded relevant to my
-goals of cross assembly and alternate object file formats and the FSF
-releases from which the stray versions had branched.
-
-I rolled the Intel i960 changes from 1.31 into versions that I call
-1.34+i960, 1.36+i960, and then 1.37.1+i960.
-
-Then I merged 1.37.1+i960 with 1.37.1+a29k to produce what I call
-1.37.1+i960+a29k or 1.37.3.
-
-From 1.37.3, I pulled in Loic's stuff. This wasn't easy as Loic's
-stuff hit all the same points as John's encapsulations. Loic's goal
-was to split the a.out from coff dependancies for native assembly on
-coff, while John's was to split for multiple cross assembly from a
-single host.
-
-Loic's config arranged files much like emacs into m-*, etc. I've
-rearranged these somewhat.
-
-Theory:
-
-The goal of the new configuration scheme is to bury all object format,
-target processor, and host machine dependancies in object, target, and
-host specific files. That is, to move all #ifdef's out of the gas
-common code.
-
-Here's how it works. There is a .h and a .c file for each object file
-format, a .h and a .c file for each target processor, and a .h for
-each host. config.gas creates {sym}links in the current directory to
-the appropriate files in the config directory. config.gas also serves
-as a list of triplets {host, target, object-format} that have been
-tested at one time or another. I also recommend that config.gas be
-used to document triplet specific notes as to purpose of the triplet,
-etc.
-
-Implementation:
-
-host.h is a {sym}link to .../config/xm-yourhost.h. It is intended to
-be used to hide host compiler, system header file, and system library
-differences between host machines. If your host needs actual c source
-files, then either: these are generally useful functions, in which
-case you should probably build a local library outside of the gas
-source tree, or someone, perhaps me, is confused about what is needed
-by different hosts.
-
-obj-format.h is a {sym}link to .../config/obj-something.h. It is intended
-
-All gas .c files include as.h.
-
-as.h #define's "gas", includes host.h, defines a number of gas
-specific structures and types, and then includes tp.h, obj.h, and
-target-environment.h.
-
-target-environment.h defines a target environment specific
-preprocessor flag, eg, TE_SUN, and then includes obj-format.h.
-
-obj-format.h defines an object format specific preprocessor flag, eg,
-OBJ_AOUT, OBJ_BOUT, OBJ_COFF, includes "target-processor.h", and then
-defines the object specific macros, functions, types, and structures.
-
-target-processor.h
-
-target-processor.
-
-Porting:
-
-There appear to be four major types of ports; new hosts, new target
-processors, new object file formats, and new target environments.
-
-
------
-
-reloc now stored internally as generic. (symbols too?) (segment types
-vs. names?)
-
-I don't mean to overlook anyone here. There have also been several
-other development lines here that I looked at and elected to bypass.
-Specifically, xxx's stabs in coff stuff was particularly tempting.
diff --git a/gnu/usr.bin/binutils/gas/config/obj-ecoff.c b/gnu/usr.bin/binutils/gas/config/obj-ecoff.c
index 6bd62a1bf58..050ba109e7d 100644
--- a/gnu/usr.bin/binutils/gas/config/obj-ecoff.c
+++ b/gnu/usr.bin/binutils/gas/config/obj-ecoff.c
@@ -286,6 +286,7 @@ const struct format_ops ecoff_format_ops =
1,
obj_ecoff_frob_symbol,
ecoff_frob_file,
+ 0,
0, 0,
0, 0,
0,
diff --git a/gnu/usr.bin/binutils/gas/config/obj-ecoff.h b/gnu/usr.bin/binutils/gas/config/obj-ecoff.h
index ea80f8ace21..6236d768717 100644
--- a/gnu/usr.bin/binutils/gas/config/obj-ecoff.h
+++ b/gnu/usr.bin/binutils/gas/config/obj-ecoff.h
@@ -1,5 +1,5 @@
/* ECOFF object file format header file.
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993, 94, 95, 1996 Free Software Foundation, Inc.
Contributed by Cygnus Support.
Written by Ian Lance Taylor <ian@cygnus.com>.
@@ -16,8 +16,9 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GAS; see the file COPYING. If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with GAS; see the file COPYING. If not, write to the Free
+ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA. */
#define OBJ_ECOFF 1
@@ -52,6 +53,9 @@ extern void ecoff_frob_file PARAMS ((void));
#define obj_read_begin_hook ecoff_read_begin_hook
#define obj_symbol_new_hook ecoff_symbol_new_hook
+/* Record file switches in the ECOFF symbol table. */
+#define obj_app_file(name) ecoff_new_file (name)
+
/* At the moment we don't want to do any stabs processing in read.c. */
#define OBJ_PROCESS_STAB(seg, what, string, type, other, desc) \
ecoff_stab ((seg), (what), (string), (type), (other), (desc))
diff --git a/gnu/usr.bin/binutils/gas/config/obj-evax.h b/gnu/usr.bin/binutils/gas/config/obj-evax.h
index 03e3cbdf63f..1d9db19f41b 100644
--- a/gnu/usr.bin/binutils/gas/config/obj-evax.h
+++ b/gnu/usr.bin/binutils/gas/config/obj-evax.h
@@ -71,9 +71,6 @@ typedef void *object_headers;
#define S_GET_TYPE(S) 0
#define S_GET_DESC(S) 0
-#undef AXP_REG_GP
-#define AXP_REG_GP AXP_REG_PV
-
#define PDSC_S_K_KIND_FP_STACK 9
#define PDSC_S_K_KIND_FP_REGISTER 10
#define PDSC_S_K_KIND_NULL 8
@@ -88,23 +85,6 @@ typedef void *object_headers;
#define LKP_S_K_SIZE 16
-struct evaxProc {
- symbolS *symbol; /* proc pdesc symbol */
- int pdsckind;
- int framereg; /* register for frame pointer */
- int framesize; /* size of frame */
- int rsa_offset;
- int ra_save;
- int fp_save;
- long imask;
- long fmask;
- int type;
- int prologue;
-};
-
-typedef struct evaxProc evaxProcT;
-typedef struct evaxProc *evaxProcP;
-
/*
* Local Variables:
* comment-column: 0
diff --git a/gnu/usr.bin/binutils/gas/macro.c b/gnu/usr.bin/binutils/gas/macro.c
index 7789b790b9a..9509207adb0 100644
--- a/gnu/usr.bin/binutils/gas/macro.c
+++ b/gnu/usr.bin/binutils/gas/macro.c
@@ -513,17 +513,20 @@ do_formals (macro, idx, in)
}
/* Define a new macro. Returns NULL on success, otherwise returns an
- error message. */
+ error message. If NAMEP is not NULL, *NAMEP is set to the name of
+ the macro which was defined. */
const char *
-define_macro (idx, in, label, get_line)
+define_macro (idx, in, label, get_line, namep)
int idx;
sb *in;
sb *label;
int (*get_line) PARAMS ((sb *));
+ const char **namep;
{
macro_entry *macro;
sb name;
+ const char *namestr;
macro = (macro_entry *) xmalloc (sizeof (macro_entry));
sb_new (&macro->sub);
@@ -562,10 +565,14 @@ define_macro (idx, in, label, get_line)
for (idx = 0; idx < name.len; idx++)
if (isupper (name.ptr[idx]))
name.ptr[idx] = tolower (name.ptr[idx]);
- hash_jam (macro_hash, sb_terminate (&name), (PTR) macro);
+ namestr = sb_terminate (&name);
+ hash_jam (macro_hash, namestr, (PTR) macro);
macro_defined = 1;
+ if (namep != NULL)
+ *namep = namestr;
+
return NULL;
}
diff --git a/gnu/usr.bin/binutils/gas/macro.h b/gnu/usr.bin/binutils/gas/macro.h
index 703ee8491df..12ed379caf5 100644
--- a/gnu/usr.bin/binutils/gas/macro.h
+++ b/gnu/usr.bin/binutils/gas/macro.h
@@ -38,7 +38,8 @@ extern void macro_init
PARAMS ((int alternate, int mri, int strip_at,
int (*) PARAMS ((const char *, int, sb *, int *))));
extern const char *define_macro
- PARAMS ((int idx, sb *in, sb *label, int (*get_line) PARAMS ((sb *))));
+ PARAMS ((int idx, sb *in, sb *label, int (*get_line) PARAMS ((sb *)),
+ const char **namep));
extern int check_macro PARAMS ((const char *, sb *, int, const char **));
extern void delete_macro PARAMS ((const char *));
extern const char *expand_irp
diff --git a/gnu/usr.bin/binutils/gas/obj.h b/gnu/usr.bin/binutils/gas/obj.h
index 9294c80aff8..32441551dee 100644
--- a/gnu/usr.bin/binutils/gas/obj.h
+++ b/gnu/usr.bin/binutils/gas/obj.h
@@ -50,6 +50,7 @@ struct format_ops {
unsigned emit_section_symbols : 1;
void (*frob_symbol) PARAMS ((symbolS *, int *));
void (*frob_file) PARAMS ((void));
+ void (*frob_file_after_relocs) PARAMS ((void));
bfd_vma (*s_get_size) PARAMS ((symbolS *));
void (*s_set_size) PARAMS ((symbolS *, bfd_vma));
bfd_vma (*s_get_align) PARAMS ((symbolS *));
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/all/cofftag.s b/gnu/usr.bin/binutils/gas/testsuite/gas/all/cofftag.s
index 432aa9a8f9f..8156599b129 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/all/cofftag.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/all/cofftag.s
@@ -39,7 +39,7 @@ _token:
.endef
.globl _what
.data
- .align 2
+ .p2align 2
_what:
.long 0
.text
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/arm/thumb.s b/gnu/usr.bin/binutils/gas/testsuite/gas/arm/thumb.s
index 095befbcde8..ec3ec6cb80b 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/arm/thumb.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/arm/thumb.s
@@ -183,3 +183,9 @@ forwardonly:
bhi wombat
blo wombat
bul wombat
+
+back:
+ bl local
+ .space (1 << 11) @ leave space to force long offsets
+local:
+ bl back
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branches.s b/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branches.s
deleted file mode 100644
index 25806153c42..00000000000
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branches.s
+++ /dev/null
@@ -1,10 +0,0 @@
- .text
-h8300_branches:
- bsr h8300_branches
- jmp h8300_branches
- jmp @r0
- jmp @@16:8
- jsr h8300_branches
- jsr @r0
- jsr @@16:8
-
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branchesh.s b/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branchesh.s
deleted file mode 100644
index 7cbc62f3e2b..00000000000
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/branchesh.s
+++ /dev/null
@@ -1,12 +0,0 @@
- .h8300h
- .text
-h8300h_branches:
- bsr h8300h_branches:8
- bsr h8300h_branches:16
- jmp h8300h_branches
- jmp @er0
- jmp @@16:8
- jsr h8300h_branches
- jsr @er0
- jsr @@16:8
-
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/macs.s b/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/macs.s
index 3623ea36117..e2df6ddb652 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/macs.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/macs.s
@@ -5,5 +5,7 @@ h8300s_mac:
ldmac er0,mach
ldmac er1,macl
mac @er0+,@er1+
+ stmac mach,er0
+ stmac macl,er1
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshift.s b/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshift.s
deleted file mode 100644
index a9aa87df95e..00000000000
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshift.s
+++ /dev/null
@@ -1,11 +0,0 @@
- .text
-h8300_rotate_shift:
- rotl r0l
- rotr r0l
- rotxl r0l
- rotxr r0l
- shal r0l
- shar r0l
- shll r0l
- shlr r0l
-
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshifth.s b/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshifth.s
deleted file mode 100644
index c7abe40a28f..00000000000
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/h8300/rotshifth.s
+++ /dev/null
@@ -1,27 +0,0 @@
- .h8300h
- .text
-h8300h_rotate_shift:
- rotl.b r0l
- rotl.w r0
- rotl.l er0
- rotr.b r0l
- rotr.w r0
- rotr.l er0
- rotxl.b r0l
- rotxl.w r0
- rotxl.l er0
- rotxr.b r0l
- rotxr.w r0
- rotxr.l er0
- shal.b r0l
- shal.w r0
- shal.l er0
- shar.b r0l
- shar.w r0
- shar.l er0
- shll.b r0l
- shll.w r0
- shll.l er0
- shlr.b r0l
- shlr.w r0
- shlr.l er0
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/hppa/reloc/reloc.exp b/gnu/usr.bin/binutils/gas/testsuite/gas/hppa/reloc/reloc.exp
index 78a6d6ee5eb..39119113071 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/hppa/reloc/reloc.exp
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/hppa/reloc/reloc.exp
@@ -507,7 +507,7 @@ proc do_function_reloc_bug {} {
set testname "funcrelocbug.s: Test for reloc bug in non-plabel function reference (part3)"
set x 0
- objdump_start_no_subdir "a.out" "-d"
+ objdump_start_no_subdir "a.out" "--prefix-addresses -d"
# Make sure we didn't put anything in the instruction itself!
while 1 {
expect {
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.d b/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.d
index ebd7ee3f093..f94bab6e777 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.d
@@ -1,7 +1,7 @@
#objdump: -d
#name: fmoveml
-# Test handling of fmoveml instruction.
+# Test handling of fmoveml and fmovemx instructions.
.*: +file format .*
@@ -35,3 +35,26 @@ Disassembly of section .text:
0+078 <foo\+78> fmoveml #1,%fpiar/%fpcr
0+080 <foo\+80> fmoveml #1,%fpiar/%fpsr
0+088 <foo\+88> fmoveml #1,%fpiar/%fpsr/%fpcr
+0+090 <foo\+90> fmovemx %fp1,%a0@
+0+094 <foo\+94> fmovemx %fp4,%a0@
+0+098 <foo\+98> fmovemx %fp7,%a0@
+0+09c <foo\+9c> fmovemx %fp1/%fp3,%a0@
+0+0a0 <foo\+a0> fmovemx %fp1-%fp4,%a0@
+0+0a4 <foo\+a4> fmovemx %fp0/%fp7,%a0@
+0+0a8 <foo\+a8> fmovemx %fp0-%fp7,%a0@
+0+0ac <foo\+ac> fmovemx %a0@,%fp0
+0+0b0 <foo\+b0> fmovemx %a0@,%fp1
+0+0b4 <foo\+b4> fmovemx %a0@,%fp7
+0+0b8 <foo\+b8> fmovemx %a0@,%fp0/%fp3
+0+0bc <foo\+bc> fmovemx %a0@,%fp0/%fp4
+0+0c0 <foo\+c0> fmovemx %a0@,%fp2-%fp4
+0+0c4 <foo\+c4> fmovemx %a0@,%fp1-%fp7
+0+0c8 <foo\+c8> fmovemx %fp0,%a0@-
+0+0cc <foo\+cc> fmovemx %fp0-%fp7,%a0@-
+0+0d0 <foo\+d0> fmovemx %fp0/%fp4,%a0@-
+0+0d4 <foo\+d4> fmovemx %a0@\+,%fp7
+0+0d8 <foo\+d8> fmovemx %a0@\+,%fp0-%fp7
+0+0dc <foo\+dc> fmovemx %a0@\+,%fp3/%fp7
+0+0e0 <foo\+e0> fmovemx %d0,%a0@-
+0+0e4 <foo\+e4> fmovemx %a0@\+,%d0
+0+0e8 <foo\+e8> fmovemx %fp1/%fp5,%a0@-
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.s b/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.s
index 42e78486c31..e74224bafc0 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/fmoveml.s
@@ -1,4 +1,4 @@
-# Test handling of the fmoveml instruction.
+# Test handling of the fmoveml and fmovemx instructions.
.text
.globl foo
foo:
@@ -31,3 +31,28 @@ foo:
fmoveml &1,%fpcr/%fpiar
fmoveml &1,%fpsr/%fpiar
fmoveml &1,%fpiar/%fpsr/%fpcr
+
+ fmovemx %fp1,%a0@
+ fmovemx %fp4,%a0@
+ fmovemx %fp7,%a0@
+ fmovemx %fp1/%fp3,%a0@
+ fmovemx %fp1-%fp4,%a0@
+ fmovemx %fp0/%fp7,%a0@
+ fmovemx %fp0-%fp7,%a0@
+ fmovemx %a0@,%fp0
+ fmovemx %a0@,%fp1
+ fmovemx %a0@,%fp7
+ fmovemx %a0@,%fp0/%fp3
+ fmovemx %a0@,%fp0/%fp4
+ fmovemx %a0@,%fp2-%fp4
+ fmovemx %a0@,%fp1-%fp7
+ fmovemx &1,%a0@-
+ fmovemx &0xff,%a0@-
+ fmovemx &0x11,%a0@-
+ fmovemx %a0@+,&1
+ fmovemx %a0@+,&0xff
+ fmovemx %a0@+,&0x11
+ fmovemx %d0,%a0@-
+ fmovemx %a0@+,%d0
+ fmovemx &sym,%a0@-
+ sym = 0x22
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.d b/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.d
deleted file mode 100644
index a9459d1daaf..00000000000
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.d
+++ /dev/null
@@ -1,88 +0,0 @@
-#name: PC-relative relocations
-#objdump: -drs -j .text
-
-.*: file format .*
-
-Contents of section .text:
- 0000 4e714e71 4cfa0300 fffa4cfa 0300fff4 NqNqL.....L.....
- 0010 4cfb0300 08ee41fa ffea41fa ffe641fa L.....A...A...A.
- 0020 ff6241fb 08de41fb 08da41fb 08d641fb .bA...A...A...A.
- 0030 0920ffd2 41fb0920 ffcc41fb 0930ffff . ..A.. ..A..0..
- 0040 ffc641fb 0930ffff ffbe4e71 61ff0000 ..A..0....Nqa...
- 0050 00586100 0052614e 614c4e71 41f90000 .Xa..RaNaLNqA...
- 0060 00a641fa 004241fa 00be41fb 083a41fb ..A..BA...A..:A.
- 0070 083641fb 083241fb 0920002e 41fb0920 .6A..2A.. ..A..
- 0080 002841fb 09300000 002241fb 09300000 .\(A..0..."A..0..
- 0090 001a41fb 09300000 001241fb 0920000a ..A..0....A.. ..
- 00a0 41fb0804 4e714e71 4e7141fb 088041fb A...NqNqNqA...A.
- 00b0 0920ff7f 41fb0920 800041fb 0930ffff . ..A.. ..A..0..
- 00c0 7fff4e71 41fb087f 41fb0920 008041fb ..NqA...A.. ..A.
- 00d0 09207fff 41fb0930 00008000 4e7141fa . ..A..0....NqA.
- 00e0 800041fb 0170ffff 7fff4e71 41fa7fff ..A..p....NqA...
- 00f0 41fb0170 00008000 4e7141fb 0170ffff A..p....NqA..p..
- 0100 ff0441fb 0930ffff fefc4e71 41f90000 ..A..0....NqA...
- 0110 0000............................... ................
-Disassembly of section \.text:
-0+0000 <.*> nop
-0+0002 <lbl_b> nop
-0+0004 <lbl_b\+2> moveml 0+0002 <lbl_b>,%a0-%a1
-0+000a <lbl_b\+8> moveml 0+0002 <lbl_b>,%a0-%a1
-0+0010 <lbl_b\+e> moveml %pc@\(0+02 <lbl_b>,%d0:l\),%a0-%a1
-0+0016 <lbl_b\+14> lea 0+0002 <lbl_b>,%a0
-0+001a <lbl_b\+18> lea 0+0002 <lbl_b>,%a0
-0+001e <lbl_b\+1c> lea f+ff82 <.*>,%a0
-0+0022 <lbl_b\+20> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+0026 <lbl_b\+24> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+002a <lbl_b\+28> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+002e <lbl_b\+2c> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+0034 <lbl_b\+32> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+003a <lbl_b\+38> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+0042 <lbl_b\+40> lea %pc@\(0+02 <lbl_b>,%d0:l\),%a0
-0+004a <lbl_b\+48> nop
-0+004c <lbl_b\+4a> bsrl 0+00a6 <lbl_a>
-0+0052 <lbl_b\+50> bsrw 0+00a6 <lbl_a>
-0+0056 <lbl_b\+54> bsrs 0+00a6 <lbl_a>
-0+0058 <lbl_b\+56> bsrs 0+00a6 <lbl_a>
-0+005a <lbl_b\+58> nop
-0+005c <lbl_b\+5a> lea 0+00a6 <lbl_a>,%a0
- RELOC: 0+005e (R_68K_)?32 \.text
-0+0062 <lbl_b\+60> lea 0+00a6 <lbl_a>,%a0
-0+0066 <lbl_b\+64> lea 0+0126 <.*>,%a0
-0+006a <lbl_b\+68> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+006e <lbl_b\+6c> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+0072 <lbl_b\+70> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+0076 <lbl_b\+74> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+007c <lbl_b\+7a> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+0082 <lbl_b\+80> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+008a <lbl_b\+88> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+0092 <lbl_b\+90> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+009a <lbl_b\+98> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+00a0 <lbl_b\+9e> lea %pc@\(0+a6 <lbl_a>,%d0:l\),%a0
-0+00a4 <lbl_b\+a2> nop
-0+00a6 <lbl_a> nop
-0+00a8 <lbl_a\+2> nop
-0+00aa <lbl_a\+4> lea %pc@\(0+2c <lbl_b\+2a>,%d0:l\),%a0
-0+00ae <lbl_a\+8> lea %pc@\(0+2f <lbl_b\+2d>,%d0:l\),%a0
-0+00b4 <lbl_a\+e> lea %pc@\(f+80b6 <.*>,%d0:l\),%a0
-0+00ba <lbl_a\+14> lea %pc@\(f+80bb <.*>,%d0:l\),%a0
-0+00c2 <lbl_a\+1c> nop
-0+00c4 <lbl_a\+1e> lea %pc@\(0+145 <.*>,%d0:l\),%a0
-0+00c8 <lbl_a\+22> lea %pc@\(0+14a <.*>,%d0:l\),%a0
-0+00ce <lbl_a\+28> lea %pc@\(0+80cf <.*>,%d0:l\),%a0
-0+00d4 <lbl_a\+2e> lea %pc@\(0+80d6 <.*>,%d0:l\),%a0
-0+00dc <lbl_a\+36> nop
-0+00de <lbl_a\+38> lea f+80e0 <.*>,%a0
-0+00e2 <lbl_a\+3c> lea %pc@\(f+80e3 <.*>\),%a0
-0+00ea <lbl_a\+44> nop
-0+00ec <lbl_a\+46> lea 0+80ed <.*>,%a0
-0+00f0 <lbl_a\+4a> lea %pc@\(0+80f2 <.*>\),%a0
-0+00f8 <lbl_a\+52> nop
-0+00fa <lbl_a\+54> lea %pc@\(0+0 <.*>\),%a0
- RELOC: 0+00fe (R_68K_PC|DISP)32 undef
-0+0102 <lbl_a\+5c> lea %pc@\(0+0 <.*>,%d0:l\),%a0
- RELOC: 0+0106 (R_68K_PC|DISP)32 undef
-0+010a <lbl_a\+64> nop
-0+010c <lbl_a\+66> lea 0+0+ <.*>,%a0
- RELOC: 0+010e (R_68K_)?32 undef
-0+0112 <lbl_a\+6c> nop
-\.\.\.
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.s b/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.s
deleted file mode 100644
index 9c5c22b90fb..00000000000
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/m68k/schwab.s
+++ /dev/null
@@ -1,59 +0,0 @@
- nop
-lbl_b: nop
- moveml lbl_b,%a0-%a1
- moveml %pc@(lbl_b),%a0-%a1
- moveml %pc@(lbl_b,%d0),%a0-%a1
- lea lbl_b,%a0
- lea %pc@(lbl_b),%a0
- lea %pc@(lbl_b-128),%a0
- lea %pc@(lbl_b,%d0),%a0
- lea %pc@(lbl_b:b,%d0),%a0
- lea %pc@(lbl_b-.-2:b,%d0),%a0
- lea %pc@(lbl_b:w,%d0),%a0
- lea %pc@(lbl_b-.-2:w,%d0),%a0
- lea %pc@(lbl_b:l,%d0),%a0
- lea %pc@(lbl_b-.-2:l,%d0),%a0
- nop
- bsrl lbl_a
- bsr lbl_a
- bsrs lbl_a
- jbsr lbl_a
- nop
- lea lbl_a,%a0
- lea %pc@(lbl_a),%a0
- lea %pc@(lbl_a+128),%a0
- lea %pc@(lbl_a,%d0),%a0
- lea %pc@(lbl_a:b,%d0),%a0
- lea %pc@(lbl_a-.-2:b,%d0),%a0
- lea %pc@(lbl_a:w,%d0),%a0
- lea %pc@(lbl_a-.-2:w,%d0),%a0
- lea %pc@(lbl_a:l,%d0),%a0
- lea %pc@(lbl_a-.-2:l,%d0),%a0
- lea %pc@(18:l,%d0),%a0
- lea %pc@(10:w,%d0),%a0
- lea %pc@(4:b,%d0),%a0
- nop
-lbl_a: nop
- nop
- lea %pc@(.-126,%d0),%a0
- lea %pc@(.-127,%d0),%a0
- lea %pc@(.-32766,%d0),%a0
- lea %pc@(.-32767,%d0),%a0
- nop
- lea %pc@(.+129,%d0),%a0
- lea %pc@(.+130,%d0),%a0
- lea %pc@(.+32769,%d0),%a0
- lea %pc@(.+32770,%d0),%a0
- nop
- lea %pc@(.-32766),%a0
- lea %pc@(.-32767),%a0
- nop
- lea %pc@(.+32769),%a0
- lea %pc@(.+32770),%a0
- nop
- lea %pc@(undef),%a0
- lea %pc@(undef,%d0),%a0
- nop
- lea undef,%a0
- nop
- .long 0
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.d
index e102792a6aa..35391eecb13 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.d
@@ -1,16 +1,15 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS abs
# Test the abs macro.
.*: +file format .*mips.*
-No symbols in .*
Disassembly of section .text:
-0+0000 bgez \$a0,0+000c
-...
-0+0008 neg \$a0,\$a0
-0+000c bgez \$a1,0+0018
-0+0010 move \$a0,\$a1
-0+0014 neg \$a0,\$a1
-...
+0+0000 <[^>]*> bgez \$a0,0+000c <foo\+c>
+0+0004 <[^>]*> nop
+0+0008 <[^>]*> neg \$a0,\$a0
+0+000c <[^>]*> bgez \$a1,0+0018 <foo\+18>
+0+0010 <[^>]*> move \$a0,\$a1
+0+0014 <[^>]*> neg \$a0,\$a1
+ ...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.s
index a205c4c8645..1f2172bcb02 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/abs.s
@@ -1,4 +1,5 @@
# Source file used to test the abs macro.
+foo:
abs $4
abs $4,$5
.space 8
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/add.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/add.s
index 4bab82a85a8..1adec90cfd1 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/add.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/add.s
@@ -1,5 +1,6 @@
# Source file used to test the add macro.
+foo:
add $4,$4,0
add $4,$4,1
add $4,$4,0x8000
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/and.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/and.s
index 3a3078e56e6..cb98369895d 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/and.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/and.s
@@ -1,5 +1,6 @@
# Source file used to test the and macro.
+foo:
and $4,$4,0
and $4,$4,1
and $4,$4,0x8000
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div-ilocks.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div-ilocks.d
index 282fb41ed50..3d665fee0eb 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div-ilocks.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div-ilocks.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS div
#source: div.s
@@ -6,112 +6,111 @@
.*: +file format .*mips.*
-No symbols in .*
Disassembly of section .text:
-0+0000 div \$zero,\$a0,\$a1
-0+0004 div \$zero,\$a0,\$a1
-0+0008 bnez \$a1,0+0014
+0+0000 div \$zero,\$a0,\$a1
+0+0004 div \$zero,\$a0,\$a1
+0+0008 bnez \$a1,0+0014
...
-0+0010 break 0x7
-0+0014 li \$at,-1
-0+0018 bne \$a1,\$at,0+002c
-0+001c lui \$at,0x8000
-0+0020 bne \$a0,\$at,0+002c
+0+0010 break 0x7
+0+0014 li \$at,-1
+0+0018 bne \$a1,\$at,0+002c
+0+001c lui \$at,0x8000
+0+0020 bne \$a0,\$at,0+002c
...
-0+0028 break 0x6
-0+002c mflo \$a0
-0+0030 div \$zero,\$a1,\$a2
-0+0034 bnez \$a2,0+0040
+0+0028 break 0x6
+0+002c mflo \$a0
+0+0030 div \$zero,\$a1,\$a2
+0+0034 bnez \$a2,0+0040
...
-0+003c break 0x7
-0+0040 li \$at,-1
-0+0044 bne \$a2,\$at,0+0058
-0+0048 lui \$at,0x8000
-0+004c bne \$a1,\$at,0+0058
+0+003c break 0x7
+0+0040 li \$at,-1
+0+0044 bne \$a2,\$at,0+0058
+0+0048 lui \$at,0x8000
+0+004c bne \$a1,\$at,0+0058
...
-0+0054 break 0x6
-0+0058 mflo \$a0
-0+005c move \$a0,\$a0
-0+0060 move \$a0,\$a1
-0+0064 neg \$a0,\$a0
-0+0068 neg \$a0,\$a1
-0+006c li \$at,2
-0+0070 div \$zero,\$a0,\$at
-0+0074 mflo \$a0
-0+0078 li \$at,2
-0+007c div \$zero,\$a1,\$at
-0+0080 mflo \$a0
-0+0084 li \$at,0x8000
-0+0088 div \$zero,\$a0,\$at
-0+008c mflo \$a0
-0+0090 li \$at,0x8000
-0+0094 div \$zero,\$a1,\$at
-0+0098 mflo \$a0
-0+009c li \$at,-32768
-0+00a0 div \$zero,\$a0,\$at
-0+00a4 mflo \$a0
-0+00a8 li \$at,-32768
-0+00ac div \$zero,\$a1,\$at
-0+00b0 mflo \$a0
-0+00b4 lui \$at,0x1
-0+00b8 div \$zero,\$a0,\$at
-0+00bc mflo \$a0
-0+00c0 lui \$at,0x1
-0+00c4 div \$zero,\$a1,\$at
-0+00c8 mflo \$a0
-0+00cc lui \$at,0x1
-0+00d0 ori \$at,\$at,0xa5a5
-0+00d4 div \$zero,\$a0,\$at
-0+00d8 mflo \$a0
-0+00dc lui \$at,0x1
-0+00e0 ori \$at,\$at,0xa5a5
-0+00e4 div \$zero,\$a1,\$at
-0+00e8 mflo \$a0
-0+00ec divu \$zero,\$a0,\$a1
-0+00f0 divu \$zero,\$a0,\$a1
-0+00f4 bnez \$a1,0+0100
+0+0054 break 0x6
+0+0058 mflo \$a0
+0+005c move \$a0,\$a0
+0+0060 move \$a0,\$a1
+0+0064 neg \$a0,\$a0
+0+0068 neg \$a0,\$a1
+0+006c li \$at,2
+0+0070 div \$zero,\$a0,\$at
+0+0074 mflo \$a0
+0+0078 li \$at,2
+0+007c div \$zero,\$a1,\$at
+0+0080 mflo \$a0
+0+0084 li \$at,0x8000
+0+0088 div \$zero,\$a0,\$at
+0+008c mflo \$a0
+0+0090 li \$at,0x8000
+0+0094 div \$zero,\$a1,\$at
+0+0098 mflo \$a0
+0+009c li \$at,-32768
+0+00a0 div \$zero,\$a0,\$at
+0+00a4 mflo \$a0
+0+00a8 li \$at,-32768
+0+00ac div \$zero,\$a1,\$at
+0+00b0 mflo \$a0
+0+00b4 lui \$at,0x1
+0+00b8 div \$zero,\$a0,\$at
+0+00bc mflo \$a0
+0+00c0 lui \$at,0x1
+0+00c4 div \$zero,\$a1,\$at
+0+00c8 mflo \$a0
+0+00cc lui \$at,0x1
+0+00d0 ori \$at,\$at,0xa5a5
+0+00d4 div \$zero,\$a0,\$at
+0+00d8 mflo \$a0
+0+00dc lui \$at,0x1
+0+00e0 ori \$at,\$at,0xa5a5
+0+00e4 div \$zero,\$a1,\$at
+0+00e8 mflo \$a0
+0+00ec divu \$zero,\$a0,\$a1
+0+00f0 divu \$zero,\$a0,\$a1
+0+00f4 bnez \$a1,0+0100
...
-0+00fc break 0x7
-0+0100 mflo \$a0
-0+0104 divu \$zero,\$a1,\$a2
-0+0108 bnez \$a2,0+0114
+0+00fc break 0x7
+0+0100 mflo \$a0
+0+0104 divu \$zero,\$a1,\$a2
+0+0108 bnez \$a2,0+0114
...
-0+0110 break 0x7
-0+0114 mflo \$a0
-0+0118 move \$a0,\$a0
-0+011c div \$zero,\$a1,\$a2
-0+0120 bnez \$a2,0+012c
+0+0110 break 0x7
+0+0114 mflo \$a0
+0+0118 move \$a0,\$a0
+0+011c div \$zero,\$a1,\$a2
+0+0120 bnez \$a2,0+012c
...
-0+0128 break 0x7
-0+012c li \$at,-1
-0+0130 bne \$a2,\$at,0+0144
-0+0134 lui \$at,0x8000
-0+0138 bne \$a1,\$at,0+0144
+0+0128 break 0x7
+0+012c li \$at,-1
+0+0130 bne \$a2,\$at,0+0144
+0+0134 lui \$at,0x8000
+0+0138 bne \$a1,\$at,0+0144
...
-0+0140 break 0x6
-0+0144 mfhi \$a0
-0+0148 li \$at,2
-0+014c divu \$zero,\$a1,\$at
-0+0150 mfhi \$a0
-0+0154 ddiv \$zero,\$a1,\$a2
-0+0158 bnez \$a2,0+0164
+0+0140 break 0x6
+0+0144 mfhi \$a0
+0+0148 li \$at,2
+0+014c divu \$zero,\$a1,\$at
+0+0150 mfhi \$a0
+0+0154 ddiv \$zero,\$a1,\$a2
+0+0158 bnez \$a2,0+0164
...
-0+0160 break 0x7
-0+0164 daddiu \$at,\$zero,-1
-0+0168 bne \$a2,\$at,0+0180
-0+016c daddiu \$at,\$zero,1
-0+0170 dsll32 \$at,\$at,0x1f
-0+0174 bne \$a1,\$at,0+0180
+0+0160 break 0x7
+0+0164 daddiu \$at,\$zero,-1
+0+0168 bne \$a2,\$at,0+0180
+0+016c daddiu \$at,\$zero,1
+0+0170 dsll32 \$at,\$at,0x1f
+0+0174 bne \$a1,\$at,0+0180
...
-0+017c break 0x6
-0+0180 mflo \$a0
-0+0184 li \$at,2
-0+0188 ddivu \$zero,\$a1,\$at
-0+018c mflo \$a0
-0+0190 li \$at,0x8000
-0+0194 ddiv \$zero,\$a1,\$at
-0+0198 mfhi \$a0
-0+019c li \$at,-32768
-0+01a0 ddivu \$zero,\$a1,\$at
-0+01a4 mfhi \$a0
+0+017c break 0x6
+0+0180 mflo \$a0
+0+0184 li \$at,2
+0+0188 ddivu \$zero,\$a1,\$at
+0+018c mflo \$a0
+0+0190 li \$at,0x8000
+0+0194 ddiv \$zero,\$a1,\$at
+0+0198 mfhi \$a0
+0+019c li \$at,-32768
+0+01a0 ddivu \$zero,\$a1,\$at
+0+01a4 mfhi \$a0
...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div.s
index bf5273947ee..6d9990672de 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/div.s
@@ -1,4 +1,5 @@
# Source file used to test the div macro.
+foo:
div $0,$4,$5
div $4,$5
div $4,$5,$6
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-empic.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-empic.d
index d82c15f13c5..0b5587aff87 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-empic.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS jal-empic
#as: -mips1 -membedded-pic
#source: jal.s
@@ -8,19 +8,19 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> jalr \$t9
-...
-0+0008 <[^>]*> jalr \$a0,\$t9
-...
-0+0010 <[^>]*> bal 0+0000 <text_label>
-[ ]*RELOC: 0+0010 PCREL16 .text
-...
-0+0018 <[^>]*> bal 0+0018 <text_label\+18>
-[ ]*RELOC: 0+0018 PCREL16 external_text_label
-...
-0+0020 <[^>]*> b 0+0000 <text_label>
-[ ]*RELOC: 0+0020 PCREL16 .text
-...
-0+0028 <[^>]*> b 0+0028 <text_label\+28>
-[ ]*RELOC: 0+0028 PCREL16 external_text_label
-...
+0+0000 <[^>]*> jalr \$t9
+0+0004 <[^>]*> nop
+0+0008 <[^>]*> jalr \$a0,\$t9
+0+000c <[^>]*> nop
+0+0010 <[^>]*> bal 0+0000 <text_label>
+[ ]*10: PCREL16 .text
+0+0014 <[^>]*> nop
+0+0018 <[^>]*> bal 0+0018 <text_label\+18>
+[ ]*18: PCREL16 external_text_label
+0+001c <[^>]*> nop
+0+0020 <[^>]*> b 0+0000 <text_label>
+[ ]*20: PCREL16 .text
+0+0024 <[^>]*> nop
+0+0028 <[^>]*> b 0+0028 <text_label\+28>
+[ ]*28: PCREL16 external_text_label
+0+002c <[^>]*> nop
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-xgot.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-xgot.d
index 8879aa4463e..51080629e1d 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-xgot.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal-xgot.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS jal-xgot
#as: -mips1 -KPIC -xgot
#source: jal-svr4pic.s
@@ -8,35 +8,35 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> lui \$gp,0x0
-[ ]*RELOC: 0+0000 R_MIPS_HI16 _gp_disp
-0+0004 <[^>]*> addiu \$gp,\$gp,0
-[ ]*RELOC: 0+0004 R_MIPS_LO16 _gp_disp
-0+0008 <[^>]*> addu \$gp,\$gp,\$t9
-0+000c <[^>]*> sw \$gp,0\(\$sp\)
-0+0010 <[^>]*> jalr \$t9
-...
-0+0018 <[^>]*> lw \$gp,0\(\$sp\)
-0+001c <[^>]*> jalr \$a0,\$t9
-...
-0+0024 <[^>]*> lw \$gp,0\(\$sp\)
-...
-0+002c <[^>]*> lw \$t9,0\(\$gp\)
-[ ]*RELOC: 0+002c R_MIPS_GOT16 .text
-...
-0+0034 <[^>]*> addiu \$t9,\$t9,0
-[ ]*RELOC: 0+0034 R_MIPS_LO16 .text
-0+0038 <[^>]*> jalr \$t9
-...
-0+0040 <[^>]*> lw \$gp,0\(\$sp\)
-0+0044 <[^>]*> lui \$t9,0x0
-[ ]*RELOC: 0+0044 R_MIPS_CALL_HI16 external_text_label
-0+0048 <[^>]*> addu \$t9,\$t9,\$gp
-0+004c <[^>]*> lw \$t9,0\(\$t9\)
-[ ]*RELOC: 0+004c R_MIPS_CALL_LO16 external_text_label
-...
-0+0054 <[^>]*> jalr \$t9
-...
-0+005c <[^>]*> lw \$gp,0\(\$sp\)
-0+0060 <[^>]*> b 0+0000 <text_label>
-...
+0+0000 <[^>]*> lui \$gp,0x0
+[ ]*0: R_MIPS_HI16 _gp_disp
+0+0004 <[^>]*> addiu \$gp,\$gp,0
+[ ]*4: R_MIPS_LO16 _gp_disp
+0+0008 <[^>]*> addu \$gp,\$gp,\$t9
+0+000c <[^>]*> sw \$gp,0\(\$sp\)
+0+0010 <[^>]*> jalr \$t9
+0+0014 <[^>]*> nop
+0+0018 <[^>]*> lw \$gp,0\(\$sp\)
+0+001c <[^>]*> jalr \$a0,\$t9
+0+0020 <[^>]*> nop
+0+0024 <[^>]*> lw \$gp,0\(\$sp\)
+0+0028 <[^>]*> nop
+0+002c <[^>]*> lw \$t9,0\(\$gp\)
+[ ]*2c: R_MIPS_GOT16 .text
+0+0030 <[^>]*> nop
+0+0034 <[^>]*> addiu \$t9,\$t9,0
+[ ]*34: R_MIPS_LO16 .text
+0+0038 <[^>]*> jalr \$t9
+0+003c <[^>]*> nop
+0+0040 <[^>]*> lw \$gp,0\(\$sp\)
+0+0044 <[^>]*> lui \$t9,0x0
+[ ]*44: R_MIPS_CALL_HI16 external_text_label
+0+0048 <[^>]*> addu \$t9,\$t9,\$gp
+0+004c <[^>]*> lw \$t9,0\(\$t9\)
+[ ]*4c: R_MIPS_CALL_LO16 external_text_label
+0+0050 <[^>]*> nop
+0+0054 <[^>]*> jalr \$t9
+0+0058 <[^>]*> nop
+0+005c <[^>]*> lw \$gp,0\(\$sp\)
+0+0060 <[^>]*> b 0+0000 <text_label>
+ ...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal.d
index ced3f3949d4..63b6de34efb 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/jal.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS jal
# Test the jal macro.
@@ -6,19 +6,19 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> jalr \$t9
-...
-0+0008 <[^>]*> jalr \$a0,\$t9
-...
-0+0010 <[^>]*> jal 0+ <text_label>
-[ ]*RELOC: 0+0010 (MIPS_JMP|MIPS_JMP|JMPADDR|R_MIPS_26) .text
-...
-0+0018 <[^>]*> jal 0+ <text_label>
-[ ]*RELOC: 0+0018 (MIPS_JMP|JMPADDR|R_MIPS_26) external_text_label
-...
-0+0020 <[^>]*> j 0+ <text_label>
-[ ]*RELOC: 0+0020 (MIPS_JMP|JMPADDR|R_MIPS_26) .text
-...
-0+0028 <[^>]*> j 0+ <text_label>
-[ ]*RELOC: 0+0028 (MIPS_JMP|JMPADDR|R_MIPS_26) external_text_label
-...
+0+0000 <[^>]*> jalr \$t9
+0+0004 <[^>]*> nop
+0+0008 <[^>]*> jalr \$a0,\$t9
+0+000c <[^>]*> nop
+0+0010 <[^>]*> jal 0+ <text_label>
+[ ]*10: (MIPS_JMP|MIPS_JMP|JMPADDR|R_MIPS_26) .text
+0+0014 <[^>]*> nop
+0+0018 <[^>]*> jal 0+ <text_label>
+[ ]*18: (MIPS_JMP|JMPADDR|R_MIPS_26) external_text_label
+0+001c <[^>]*> nop
+0+0020 <[^>]*> j 0+ <text_label>
+[ ]*20: (MIPS_JMP|JMPADDR|R_MIPS_26) .text
+0+0024 <[^>]*> nop
+0+0028 <[^>]*> j 0+ <text_label>
+[ ]*28: (MIPS_JMP|JMPADDR|R_MIPS_26) external_text_label
+0+002c <[^>]*> nop
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/la-xgot.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/la-xgot.d
index e50adf76861..8a91fcb71b5 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/la-xgot.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/la-xgot.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS la-xgot
#as: -mips1 -KPIC -xgot
#source: la.s
@@ -8,611 +8,611 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> li \$a0,0
-0+0004 <[^>]*> li \$a0,1
-0+0008 <[^>]*> li \$a0,0x8000
-0+000c <[^>]*> li \$a0,-32768
-0+0010 <[^>]*> lui \$a0,0x1
-0+0014 <[^>]*> lui \$a0,0x1
-0+0018 <[^>]*> ori \$a0,\$a0,0xa5a5
-0+001c <[^>]*> li \$a0,0
-0+0020 <[^>]*> addu \$a0,\$a0,\$a1
-0+0024 <[^>]*> li \$a0,1
-0+0028 <[^>]*> addu \$a0,\$a0,\$a1
-0+002c <[^>]*> li \$a0,0x8000
-0+0030 <[^>]*> addu \$a0,\$a0,\$a1
-0+0034 <[^>]*> li \$a0,-32768
-0+0038 <[^>]*> addu \$a0,\$a0,\$a1
-0+003c <[^>]*> lui \$a0,0x1
-0+0040 <[^>]*> addu \$a0,\$a0,\$a1
-0+0044 <[^>]*> lui \$a0,0x1
-0+0048 <[^>]*> ori \$a0,\$a0,0xa5a5
-0+004c <[^>]*> addu \$a0,\$a0,\$a1
-0+0050 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0050 R_MIPS_GOT16 .data
-...
-0+0058 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+0058 R_MIPS_LO16 .data
-0+005c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+005c R_MIPS_GOT_HI16 big_external_data_label
-0+0060 <[^>]*> addu \$a0,\$a0,\$gp
-0+0064 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0064 R_MIPS_GOT_LO16 big_external_data_label
-0+0068 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0068 R_MIPS_GOT_HI16 small_external_data_label
-0+006c <[^>]*> addu \$a0,\$a0,\$gp
-0+0070 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0070 R_MIPS_GOT_LO16 small_external_data_label
-0+0074 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0074 R_MIPS_GOT_HI16 big_external_common
-0+0078 <[^>]*> addu \$a0,\$a0,\$gp
-0+007c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+007c R_MIPS_GOT_LO16 big_external_common
-0+0080 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0080 R_MIPS_GOT_HI16 small_external_common
-0+0084 <[^>]*> addu \$a0,\$a0,\$gp
-0+0088 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0088 R_MIPS_GOT_LO16 small_external_common
-0+008c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+008c R_MIPS_GOT16 .bss
-...
-0+0094 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+0094 R_MIPS_LO16 .bss
-0+0098 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0098 R_MIPS_GOT16 .bss
-...
-0+00a0 <[^>]*> addiu \$a0,\$a0,1000
-[ ]*RELOC: 0+00a0 R_MIPS_LO16 .bss
-0+00a4 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+00a4 R_MIPS_GOT16 .data
-...
-0+00ac <[^>]*> addiu \$a0,\$a0,1
-[ ]*RELOC: 0+00ac R_MIPS_LO16 .data
-0+00b0 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+00b0 R_MIPS_GOT_HI16 big_external_data_label
-0+00b4 <[^>]*> addu \$a0,\$a0,\$gp
-0+00b8 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+00b8 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+00c0 <[^>]*> addiu \$a0,\$a0,1
-0+00c4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+00c4 R_MIPS_GOT_HI16 small_external_data_label
-0+00c8 <[^>]*> addu \$a0,\$a0,\$gp
-0+00cc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+00cc R_MIPS_GOT_LO16 small_external_data_label
-...
-0+00d4 <[^>]*> addiu \$a0,\$a0,1
-0+00d8 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+00d8 R_MIPS_GOT_HI16 big_external_common
-0+00dc <[^>]*> addu \$a0,\$a0,\$gp
-0+00e0 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+00e0 R_MIPS_GOT_LO16 big_external_common
-...
-0+00e8 <[^>]*> addiu \$a0,\$a0,1
-0+00ec <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+00ec R_MIPS_GOT_HI16 small_external_common
-0+00f0 <[^>]*> addu \$a0,\$a0,\$gp
-0+00f4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+00f4 R_MIPS_GOT_LO16 small_external_common
-...
-0+00fc <[^>]*> addiu \$a0,\$a0,1
-0+0100 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0100 R_MIPS_GOT16 .bss
-...
-0+0108 <[^>]*> addiu \$a0,\$a0,1
-[ ]*RELOC: 0+0108 R_MIPS_LO16 .bss
-0+010c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+010c R_MIPS_GOT16 .bss
-...
-0+0114 <[^>]*> addiu \$a0,\$a0,1001
-[ ]*RELOC: 0+0114 R_MIPS_LO16 .bss
-0+0118 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0118 R_MIPS_GOT16 .data
-0+011c <[^>]*> lui \$at,0x1
-0+0120 <[^>]*> addiu \$at,\$at,-32768
-[ ]*RELOC: 0+0120 R_MIPS_LO16 .data
-0+0124 <[^>]*> addu \$a0,\$a0,\$at
-0+0128 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0128 R_MIPS_GOT_HI16 big_external_data_label
-0+012c <[^>]*> addu \$a0,\$a0,\$gp
-0+0130 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0130 R_MIPS_GOT_LO16 big_external_data_label
-0+0134 <[^>]*> lui \$at,0x1
-0+0138 <[^>]*> addiu \$at,\$at,-32768
-0+013c <[^>]*> addu \$a0,\$a0,\$at
-0+0140 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0140 R_MIPS_GOT_HI16 small_external_data_label
-0+0144 <[^>]*> addu \$a0,\$a0,\$gp
-0+0148 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0148 R_MIPS_GOT_LO16 small_external_data_label
-0+014c <[^>]*> lui \$at,0x1
-0+0150 <[^>]*> addiu \$at,\$at,-32768
-0+0154 <[^>]*> addu \$a0,\$a0,\$at
-0+0158 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0158 R_MIPS_GOT_HI16 big_external_common
-0+015c <[^>]*> addu \$a0,\$a0,\$gp
-0+0160 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0160 R_MIPS_GOT_LO16 big_external_common
-0+0164 <[^>]*> lui \$at,0x1
-0+0168 <[^>]*> addiu \$at,\$at,-32768
-0+016c <[^>]*> addu \$a0,\$a0,\$at
-0+0170 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0170 R_MIPS_GOT_HI16 small_external_common
-0+0174 <[^>]*> addu \$a0,\$a0,\$gp
-0+0178 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0178 R_MIPS_GOT_LO16 small_external_common
-0+017c <[^>]*> lui \$at,0x1
-0+0180 <[^>]*> addiu \$at,\$at,-32768
-0+0184 <[^>]*> addu \$a0,\$a0,\$at
-0+0188 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0188 R_MIPS_GOT16 .bss
-0+018c <[^>]*> lui \$at,0x1
-0+0190 <[^>]*> addiu \$at,\$at,-32768
-[ ]*RELOC: 0+0190 R_MIPS_LO16 .bss
-0+0194 <[^>]*> addu \$a0,\$a0,\$at
-0+0198 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0198 R_MIPS_GOT16 .bss
-0+019c <[^>]*> lui \$at,0x1
-0+01a0 <[^>]*> addiu \$at,\$at,-31768
-[ ]*RELOC: 0+01a0 R_MIPS_LO16 .bss
-0+01a4 <[^>]*> addu \$a0,\$a0,\$at
-0+01a8 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+01a8 R_MIPS_GOT16 .data
-...
-0+01b0 <[^>]*> addiu \$a0,\$a0,-32768
-[ ]*RELOC: 0+01b0 R_MIPS_LO16 .data
-0+01b4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+01b4 R_MIPS_GOT_HI16 big_external_data_label
-0+01b8 <[^>]*> addu \$a0,\$a0,\$gp
-0+01bc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01bc R_MIPS_GOT_LO16 big_external_data_label
-...
-0+01c4 <[^>]*> addiu \$a0,\$a0,-32768
-0+01c8 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+01c8 R_MIPS_GOT_HI16 small_external_data_label
-0+01cc <[^>]*> addu \$a0,\$a0,\$gp
-0+01d0 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01d0 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+01d8 <[^>]*> addiu \$a0,\$a0,-32768
-0+01dc <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+01dc R_MIPS_GOT_HI16 big_external_common
-0+01e0 <[^>]*> addu \$a0,\$a0,\$gp
-0+01e4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01e4 R_MIPS_GOT_LO16 big_external_common
-...
-0+01ec <[^>]*> addiu \$a0,\$a0,-32768
-0+01f0 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+01f0 R_MIPS_GOT_HI16 small_external_common
-0+01f4 <[^>]*> addu \$a0,\$a0,\$gp
-0+01f8 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01f8 R_MIPS_GOT_LO16 small_external_common
-...
-0+0200 <[^>]*> addiu \$a0,\$a0,-32768
-0+0204 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0204 R_MIPS_GOT16 .bss
-...
-0+020c <[^>]*> addiu \$a0,\$a0,-32768
-[ ]*RELOC: 0+020c R_MIPS_LO16 .bss
-0+0210 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0210 R_MIPS_GOT16 .bss
-...
-0+0218 <[^>]*> addiu \$a0,\$a0,-31768
-[ ]*RELOC: 0+0218 R_MIPS_LO16 .bss
-0+021c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+021c R_MIPS_GOT16 .data
-0+0220 <[^>]*> lui \$at,0x1
-0+0224 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+0224 R_MIPS_LO16 .data
-0+0228 <[^>]*> addu \$a0,\$a0,\$at
-0+022c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+022c R_MIPS_GOT_HI16 big_external_data_label
-0+0230 <[^>]*> addu \$a0,\$a0,\$gp
-0+0234 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0234 R_MIPS_GOT_LO16 big_external_data_label
-0+0238 <[^>]*> lui \$at,0x1
-0+023c <[^>]*> addiu \$at,\$at,0
-0+0240 <[^>]*> addu \$a0,\$a0,\$at
-0+0244 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0244 R_MIPS_GOT_HI16 small_external_data_label
-0+0248 <[^>]*> addu \$a0,\$a0,\$gp
-0+024c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+024c R_MIPS_GOT_LO16 small_external_data_label
-0+0250 <[^>]*> lui \$at,0x1
-0+0254 <[^>]*> addiu \$at,\$at,0
-0+0258 <[^>]*> addu \$a0,\$a0,\$at
-0+025c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+025c R_MIPS_GOT_HI16 big_external_common
-0+0260 <[^>]*> addu \$a0,\$a0,\$gp
-0+0264 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0264 R_MIPS_GOT_LO16 big_external_common
-0+0268 <[^>]*> lui \$at,0x1
-0+026c <[^>]*> addiu \$at,\$at,0
-0+0270 <[^>]*> addu \$a0,\$a0,\$at
-0+0274 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0274 R_MIPS_GOT_HI16 small_external_common
-0+0278 <[^>]*> addu \$a0,\$a0,\$gp
-0+027c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+027c R_MIPS_GOT_LO16 small_external_common
-0+0280 <[^>]*> lui \$at,0x1
-0+0284 <[^>]*> addiu \$at,\$at,0
-0+0288 <[^>]*> addu \$a0,\$a0,\$at
-0+028c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+028c R_MIPS_GOT16 .bss
-0+0290 <[^>]*> lui \$at,0x1
-0+0294 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+0294 R_MIPS_LO16 .bss
-0+0298 <[^>]*> addu \$a0,\$a0,\$at
-0+029c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+029c R_MIPS_GOT16 .bss
-0+02a0 <[^>]*> lui \$at,0x1
-0+02a4 <[^>]*> addiu \$at,\$at,1000
-[ ]*RELOC: 0+02a4 R_MIPS_LO16 .bss
-0+02a8 <[^>]*> addu \$a0,\$a0,\$at
-0+02ac <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+02ac R_MIPS_GOT16 .data
-0+02b0 <[^>]*> lui \$at,0x2
-0+02b4 <[^>]*> addiu \$at,\$at,-23131
-[ ]*RELOC: 0+02b4 R_MIPS_LO16 .data
-0+02b8 <[^>]*> addu \$a0,\$a0,\$at
-0+02bc <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+02bc R_MIPS_GOT_HI16 big_external_data_label
-0+02c0 <[^>]*> addu \$a0,\$a0,\$gp
-0+02c4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+02c4 R_MIPS_GOT_LO16 big_external_data_label
-0+02c8 <[^>]*> lui \$at,0x2
-0+02cc <[^>]*> addiu \$at,\$at,-23131
-0+02d0 <[^>]*> addu \$a0,\$a0,\$at
-0+02d4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+02d4 R_MIPS_GOT_HI16 small_external_data_label
-0+02d8 <[^>]*> addu \$a0,\$a0,\$gp
-0+02dc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+02dc R_MIPS_GOT_LO16 small_external_data_label
-0+02e0 <[^>]*> lui \$at,0x2
-0+02e4 <[^>]*> addiu \$at,\$at,-23131
-0+02e8 <[^>]*> addu \$a0,\$a0,\$at
-0+02ec <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+02ec R_MIPS_GOT_HI16 big_external_common
-0+02f0 <[^>]*> addu \$a0,\$a0,\$gp
-0+02f4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+02f4 R_MIPS_GOT_LO16 big_external_common
-0+02f8 <[^>]*> lui \$at,0x2
-0+02fc <[^>]*> addiu \$at,\$at,-23131
-0+0300 <[^>]*> addu \$a0,\$a0,\$at
-0+0304 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0304 R_MIPS_GOT_HI16 small_external_common
-0+0308 <[^>]*> addu \$a0,\$a0,\$gp
-0+030c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+030c R_MIPS_GOT_LO16 small_external_common
-0+0310 <[^>]*> lui \$at,0x2
-0+0314 <[^>]*> addiu \$at,\$at,-23131
-0+0318 <[^>]*> addu \$a0,\$a0,\$at
-0+031c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+031c R_MIPS_GOT16 .bss
-0+0320 <[^>]*> lui \$at,0x2
-0+0324 <[^>]*> addiu \$at,\$at,-23131
-[ ]*RELOC: 0+0324 R_MIPS_LO16 .bss
-0+0328 <[^>]*> addu \$a0,\$a0,\$at
-0+032c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+032c R_MIPS_GOT16 .bss
-0+0330 <[^>]*> lui \$at,0x2
-0+0334 <[^>]*> addiu \$at,\$at,-22131
-[ ]*RELOC: 0+0334 R_MIPS_LO16 .bss
-0+0338 <[^>]*> addu \$a0,\$a0,\$at
-0+033c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+033c R_MIPS_GOT16 .data
-...
-0+0344 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+0344 R_MIPS_LO16 .data
-0+0348 <[^>]*> addu \$a0,\$a0,\$a1
-0+034c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+034c R_MIPS_GOT_HI16 big_external_data_label
-0+0350 <[^>]*> addu \$a0,\$a0,\$gp
-0+0354 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0354 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+035c <[^>]*> addu \$a0,\$a0,\$a1
-0+0360 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0360 R_MIPS_GOT_HI16 small_external_data_label
-0+0364 <[^>]*> addu \$a0,\$a0,\$gp
-0+0368 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0368 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0370 <[^>]*> addu \$a0,\$a0,\$a1
-0+0374 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0374 R_MIPS_GOT_HI16 big_external_common
-0+0378 <[^>]*> addu \$a0,\$a0,\$gp
-0+037c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+037c R_MIPS_GOT_LO16 big_external_common
-...
-0+0384 <[^>]*> addu \$a0,\$a0,\$a1
-0+0388 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0388 R_MIPS_GOT_HI16 small_external_common
-0+038c <[^>]*> addu \$a0,\$a0,\$gp
-0+0390 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0390 R_MIPS_GOT_LO16 small_external_common
-...
-0+0398 <[^>]*> addu \$a0,\$a0,\$a1
-0+039c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+039c R_MIPS_GOT16 .bss
-...
-0+03a4 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+03a4 R_MIPS_LO16 .bss
-0+03a8 <[^>]*> addu \$a0,\$a0,\$a1
-0+03ac <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+03ac R_MIPS_GOT16 .bss
-...
-0+03b4 <[^>]*> addiu \$a0,\$a0,1000
-[ ]*RELOC: 0+03b4 R_MIPS_LO16 .bss
-0+03b8 <[^>]*> addu \$a0,\$a0,\$a1
-0+03bc <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+03bc R_MIPS_GOT16 .data
-...
-0+03c4 <[^>]*> addiu \$a0,\$a0,1
-[ ]*RELOC: 0+03c4 R_MIPS_LO16 .data
-0+03c8 <[^>]*> addu \$a0,\$a0,\$a1
-0+03cc <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+03cc R_MIPS_GOT_HI16 big_external_data_label
-0+03d0 <[^>]*> addu \$a0,\$a0,\$gp
-0+03d4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+03d4 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+03dc <[^>]*> addiu \$a0,\$a0,1
-0+03e0 <[^>]*> addu \$a0,\$a0,\$a1
-0+03e4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+03e4 R_MIPS_GOT_HI16 small_external_data_label
-0+03e8 <[^>]*> addu \$a0,\$a0,\$gp
-0+03ec <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+03ec R_MIPS_GOT_LO16 small_external_data_label
-...
-0+03f4 <[^>]*> addiu \$a0,\$a0,1
-0+03f8 <[^>]*> addu \$a0,\$a0,\$a1
-0+03fc <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+03fc R_MIPS_GOT_HI16 big_external_common
-0+0400 <[^>]*> addu \$a0,\$a0,\$gp
-0+0404 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0404 R_MIPS_GOT_LO16 big_external_common
-...
-0+040c <[^>]*> addiu \$a0,\$a0,1
-0+0410 <[^>]*> addu \$a0,\$a0,\$a1
-0+0414 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0414 R_MIPS_GOT_HI16 small_external_common
-0+0418 <[^>]*> addu \$a0,\$a0,\$gp
-0+041c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+041c R_MIPS_GOT_LO16 small_external_common
-...
-0+0424 <[^>]*> addiu \$a0,\$a0,1
-0+0428 <[^>]*> addu \$a0,\$a0,\$a1
-0+042c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+042c R_MIPS_GOT16 .bss
-...
-0+0434 <[^>]*> addiu \$a0,\$a0,1
-[ ]*RELOC: 0+0434 R_MIPS_LO16 .bss
-0+0438 <[^>]*> addu \$a0,\$a0,\$a1
-0+043c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+043c R_MIPS_GOT16 .bss
-...
-0+0444 <[^>]*> addiu \$a0,\$a0,1001
-[ ]*RELOC: 0+0444 R_MIPS_LO16 .bss
-0+0448 <[^>]*> addu \$a0,\$a0,\$a1
-0+044c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+044c R_MIPS_GOT16 .data
-0+0450 <[^>]*> lui \$at,0x1
-0+0454 <[^>]*> addiu \$at,\$at,-32768
-[ ]*RELOC: 0+0454 R_MIPS_LO16 .data
-0+0458 <[^>]*> addu \$a0,\$a0,\$at
-0+045c <[^>]*> addu \$a0,\$a0,\$a1
-0+0460 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0460 R_MIPS_GOT_HI16 big_external_data_label
-0+0464 <[^>]*> addu \$a0,\$a0,\$gp
-0+0468 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0468 R_MIPS_GOT_LO16 big_external_data_label
-0+046c <[^>]*> lui \$at,0x1
-0+0470 <[^>]*> addiu \$at,\$at,-32768
-0+0474 <[^>]*> addu \$a0,\$a0,\$at
-0+0478 <[^>]*> addu \$a0,\$a0,\$a1
-0+047c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+047c R_MIPS_GOT_HI16 small_external_data_label
-0+0480 <[^>]*> addu \$a0,\$a0,\$gp
-0+0484 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0484 R_MIPS_GOT_LO16 small_external_data_label
-0+0488 <[^>]*> lui \$at,0x1
-0+048c <[^>]*> addiu \$at,\$at,-32768
-0+0490 <[^>]*> addu \$a0,\$a0,\$at
-0+0494 <[^>]*> addu \$a0,\$a0,\$a1
-0+0498 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0498 R_MIPS_GOT_HI16 big_external_common
-0+049c <[^>]*> addu \$a0,\$a0,\$gp
-0+04a0 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+04a0 R_MIPS_GOT_LO16 big_external_common
-0+04a4 <[^>]*> lui \$at,0x1
-0+04a8 <[^>]*> addiu \$at,\$at,-32768
-0+04ac <[^>]*> addu \$a0,\$a0,\$at
-0+04b0 <[^>]*> addu \$a0,\$a0,\$a1
-0+04b4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+04b4 R_MIPS_GOT_HI16 small_external_common
-0+04b8 <[^>]*> addu \$a0,\$a0,\$gp
-0+04bc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+04bc R_MIPS_GOT_LO16 small_external_common
-0+04c0 <[^>]*> lui \$at,0x1
-0+04c4 <[^>]*> addiu \$at,\$at,-32768
-0+04c8 <[^>]*> addu \$a0,\$a0,\$at
-0+04cc <[^>]*> addu \$a0,\$a0,\$a1
-0+04d0 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+04d0 R_MIPS_GOT16 .bss
-0+04d4 <[^>]*> lui \$at,0x1
-0+04d8 <[^>]*> addiu \$at,\$at,-32768
-[ ]*RELOC: 0+04d8 R_MIPS_LO16 .bss
-0+04dc <[^>]*> addu \$a0,\$a0,\$at
-0+04e0 <[^>]*> addu \$a0,\$a0,\$a1
-0+04e4 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+04e4 R_MIPS_GOT16 .bss
-0+04e8 <[^>]*> lui \$at,0x1
-0+04ec <[^>]*> addiu \$at,\$at,-31768
-[ ]*RELOC: 0+04ec R_MIPS_LO16 .bss
-0+04f0 <[^>]*> addu \$a0,\$a0,\$at
-0+04f4 <[^>]*> addu \$a0,\$a0,\$a1
-0+04f8 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+04f8 R_MIPS_GOT16 .data
-...
-0+0500 <[^>]*> addiu \$a0,\$a0,-32768
-[ ]*RELOC: 0+0500 R_MIPS_LO16 .data
-0+0504 <[^>]*> addu \$a0,\$a0,\$a1
-0+0508 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0508 R_MIPS_GOT_HI16 big_external_data_label
-0+050c <[^>]*> addu \$a0,\$a0,\$gp
-0+0510 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0510 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0518 <[^>]*> addiu \$a0,\$a0,-32768
-0+051c <[^>]*> addu \$a0,\$a0,\$a1
-0+0520 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0520 R_MIPS_GOT_HI16 small_external_data_label
-0+0524 <[^>]*> addu \$a0,\$a0,\$gp
-0+0528 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0528 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0530 <[^>]*> addiu \$a0,\$a0,-32768
-0+0534 <[^>]*> addu \$a0,\$a0,\$a1
-0+0538 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0538 R_MIPS_GOT_HI16 big_external_common
-0+053c <[^>]*> addu \$a0,\$a0,\$gp
-0+0540 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0540 R_MIPS_GOT_LO16 big_external_common
-...
-0+0548 <[^>]*> addiu \$a0,\$a0,-32768
-0+054c <[^>]*> addu \$a0,\$a0,\$a1
-0+0550 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0550 R_MIPS_GOT_HI16 small_external_common
-0+0554 <[^>]*> addu \$a0,\$a0,\$gp
-0+0558 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0558 R_MIPS_GOT_LO16 small_external_common
-...
-0+0560 <[^>]*> addiu \$a0,\$a0,-32768
-0+0564 <[^>]*> addu \$a0,\$a0,\$a1
-0+0568 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0568 R_MIPS_GOT16 .bss
-...
-0+0570 <[^>]*> addiu \$a0,\$a0,-32768
-[ ]*RELOC: 0+0570 R_MIPS_LO16 .bss
-0+0574 <[^>]*> addu \$a0,\$a0,\$a1
-0+0578 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0578 R_MIPS_GOT16 .bss
-...
-0+0580 <[^>]*> addiu \$a0,\$a0,-31768
-[ ]*RELOC: 0+0580 R_MIPS_LO16 .bss
-0+0584 <[^>]*> addu \$a0,\$a0,\$a1
-0+0588 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0588 R_MIPS_GOT16 .data
-0+058c <[^>]*> lui \$at,0x1
-0+0590 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+0590 R_MIPS_LO16 .data
-0+0594 <[^>]*> addu \$a0,\$a0,\$at
-0+0598 <[^>]*> addu \$a0,\$a0,\$a1
-0+059c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+059c R_MIPS_GOT_HI16 big_external_data_label
-0+05a0 <[^>]*> addu \$a0,\$a0,\$gp
-0+05a4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+05a4 R_MIPS_GOT_LO16 big_external_data_label
-0+05a8 <[^>]*> lui \$at,0x1
-0+05ac <[^>]*> addiu \$at,\$at,0
-0+05b0 <[^>]*> addu \$a0,\$a0,\$at
-0+05b4 <[^>]*> addu \$a0,\$a0,\$a1
-0+05b8 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+05b8 R_MIPS_GOT_HI16 small_external_data_label
-0+05bc <[^>]*> addu \$a0,\$a0,\$gp
-0+05c0 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+05c0 R_MIPS_GOT_LO16 small_external_data_label
-0+05c4 <[^>]*> lui \$at,0x1
-0+05c8 <[^>]*> addiu \$at,\$at,0
-0+05cc <[^>]*> addu \$a0,\$a0,\$at
-0+05d0 <[^>]*> addu \$a0,\$a0,\$a1
-0+05d4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+05d4 R_MIPS_GOT_HI16 big_external_common
-0+05d8 <[^>]*> addu \$a0,\$a0,\$gp
-0+05dc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+05dc R_MIPS_GOT_LO16 big_external_common
-0+05e0 <[^>]*> lui \$at,0x1
-0+05e4 <[^>]*> addiu \$at,\$at,0
-0+05e8 <[^>]*> addu \$a0,\$a0,\$at
-0+05ec <[^>]*> addu \$a0,\$a0,\$a1
-0+05f0 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+05f0 R_MIPS_GOT_HI16 small_external_common
-0+05f4 <[^>]*> addu \$a0,\$a0,\$gp
-0+05f8 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+05f8 R_MIPS_GOT_LO16 small_external_common
-0+05fc <[^>]*> lui \$at,0x1
-0+0600 <[^>]*> addiu \$at,\$at,0
-0+0604 <[^>]*> addu \$a0,\$a0,\$at
-0+0608 <[^>]*> addu \$a0,\$a0,\$a1
-0+060c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+060c R_MIPS_GOT16 .bss
-0+0610 <[^>]*> lui \$at,0x1
-0+0614 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+0614 R_MIPS_LO16 .bss
-0+0618 <[^>]*> addu \$a0,\$a0,\$at
-0+061c <[^>]*> addu \$a0,\$a0,\$a1
-0+0620 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0620 R_MIPS_GOT16 .bss
-0+0624 <[^>]*> lui \$at,0x1
-0+0628 <[^>]*> addiu \$at,\$at,1000
-[ ]*RELOC: 0+0628 R_MIPS_LO16 .bss
-0+062c <[^>]*> addu \$a0,\$a0,\$at
-0+0630 <[^>]*> addu \$a0,\$a0,\$a1
-0+0634 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0634 R_MIPS_GOT16 .data
-0+0638 <[^>]*> lui \$at,0x2
-0+063c <[^>]*> addiu \$at,\$at,-23131
-[ ]*RELOC: 0+063c R_MIPS_LO16 .data
-0+0640 <[^>]*> addu \$a0,\$a0,\$at
-0+0644 <[^>]*> addu \$a0,\$a0,\$a1
-0+0648 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0648 R_MIPS_GOT_HI16 big_external_data_label
-0+064c <[^>]*> addu \$a0,\$a0,\$gp
-0+0650 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0650 R_MIPS_GOT_LO16 big_external_data_label
-0+0654 <[^>]*> lui \$at,0x2
-0+0658 <[^>]*> addiu \$at,\$at,-23131
-0+065c <[^>]*> addu \$a0,\$a0,\$at
-0+0660 <[^>]*> addu \$a0,\$a0,\$a1
-0+0664 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0664 R_MIPS_GOT_HI16 small_external_data_label
-0+0668 <[^>]*> addu \$a0,\$a0,\$gp
-0+066c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+066c R_MIPS_GOT_LO16 small_external_data_label
-0+0670 <[^>]*> lui \$at,0x2
-0+0674 <[^>]*> addiu \$at,\$at,-23131
-0+0678 <[^>]*> addu \$a0,\$a0,\$at
-0+067c <[^>]*> addu \$a0,\$a0,\$a1
-0+0680 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0680 R_MIPS_GOT_HI16 big_external_common
-0+0684 <[^>]*> addu \$a0,\$a0,\$gp
-0+0688 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0688 R_MIPS_GOT_LO16 big_external_common
-0+068c <[^>]*> lui \$at,0x2
-0+0690 <[^>]*> addiu \$at,\$at,-23131
-0+0694 <[^>]*> addu \$a0,\$a0,\$at
-0+0698 <[^>]*> addu \$a0,\$a0,\$a1
-0+069c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+069c R_MIPS_GOT_HI16 small_external_common
-0+06a0 <[^>]*> addu \$a0,\$a0,\$gp
-0+06a4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+06a4 R_MIPS_GOT_LO16 small_external_common
-0+06a8 <[^>]*> lui \$at,0x2
-0+06ac <[^>]*> addiu \$at,\$at,-23131
-0+06b0 <[^>]*> addu \$a0,\$a0,\$at
-0+06b4 <[^>]*> addu \$a0,\$a0,\$a1
-0+06b8 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+06b8 R_MIPS_GOT16 .bss
-0+06bc <[^>]*> lui \$at,0x2
-0+06c0 <[^>]*> addiu \$at,\$at,-23131
-[ ]*RELOC: 0+06c0 R_MIPS_LO16 .bss
-0+06c4 <[^>]*> addu \$a0,\$a0,\$at
-0+06c8 <[^>]*> addu \$a0,\$a0,\$a1
-0+06cc <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+06cc R_MIPS_GOT16 .bss
-0+06d0 <[^>]*> lui \$at,0x2
-0+06d4 <[^>]*> addiu \$at,\$at,-22131
-[ ]*RELOC: 0+06d4 R_MIPS_LO16 .bss
-0+06d8 <[^>]*> addu \$a0,\$a0,\$at
-0+06dc <[^>]*> addu \$a0,\$a0,\$a1
+0+0000 <[^>]*> li \$a0,0
+0+0004 <[^>]*> li \$a0,1
+0+0008 <[^>]*> li \$a0,0x8000
+0+000c <[^>]*> li \$a0,-32768
+0+0010 <[^>]*> lui \$a0,0x1
+0+0014 <[^>]*> lui \$a0,0x1
+0+0018 <[^>]*> ori \$a0,\$a0,0xa5a5
+0+001c <[^>]*> li \$a0,0
+0+0020 <[^>]*> addu \$a0,\$a0,\$a1
+0+0024 <[^>]*> li \$a0,1
+0+0028 <[^>]*> addu \$a0,\$a0,\$a1
+0+002c <[^>]*> li \$a0,0x8000
+0+0030 <[^>]*> addu \$a0,\$a0,\$a1
+0+0034 <[^>]*> li \$a0,-32768
+0+0038 <[^>]*> addu \$a0,\$a0,\$a1
+0+003c <[^>]*> lui \$a0,0x1
+0+0040 <[^>]*> addu \$a0,\$a0,\$a1
+0+0044 <[^>]*> lui \$a0,0x1
+0+0048 <[^>]*> ori \$a0,\$a0,0xa5a5
+0+004c <[^>]*> addu \$a0,\$a0,\$a1
+0+0050 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*50: R_MIPS_GOT16 .data
+0+0054 <[^>]*> nop
+0+0058 <[^>]*> addiu \$a0,\$a0,0
+[ ]*58: R_MIPS_LO16 .data
+0+005c <[^>]*> lui \$a0,0x0
+[ ]*5c: R_MIPS_GOT_HI16 big_external_data_label
+0+0060 <[^>]*> addu \$a0,\$a0,\$gp
+0+0064 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*64: R_MIPS_GOT_LO16 big_external_data_label
+0+0068 <[^>]*> lui \$a0,0x0
+[ ]*68: R_MIPS_GOT_HI16 small_external_data_label
+0+006c <[^>]*> addu \$a0,\$a0,\$gp
+0+0070 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*70: R_MIPS_GOT_LO16 small_external_data_label
+0+0074 <[^>]*> lui \$a0,0x0
+[ ]*74: R_MIPS_GOT_HI16 big_external_common
+0+0078 <[^>]*> addu \$a0,\$a0,\$gp
+0+007c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*7c: R_MIPS_GOT_LO16 big_external_common
+0+0080 <[^>]*> lui \$a0,0x0
+[ ]*80: R_MIPS_GOT_HI16 small_external_common
+0+0084 <[^>]*> addu \$a0,\$a0,\$gp
+0+0088 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*88: R_MIPS_GOT_LO16 small_external_common
+0+008c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*8c: R_MIPS_GOT16 .bss
+0+0090 <[^>]*> nop
+0+0094 <[^>]*> addiu \$a0,\$a0,0
+[ ]*94: R_MIPS_LO16 .bss
+0+0098 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*98: R_MIPS_GOT16 .bss
+0+009c <[^>]*> nop
+0+00a0 <[^>]*> addiu \$a0,\$a0,1000
+[ ]*a0: R_MIPS_LO16 .bss
+0+00a4 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*a4: R_MIPS_GOT16 .data
+0+00a8 <[^>]*> nop
+0+00ac <[^>]*> addiu \$a0,\$a0,1
+[ ]*ac: R_MIPS_LO16 .data
+0+00b0 <[^>]*> lui \$a0,0x0
+[ ]*b0: R_MIPS_GOT_HI16 big_external_data_label
+0+00b4 <[^>]*> addu \$a0,\$a0,\$gp
+0+00b8 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*b8: R_MIPS_GOT_LO16 big_external_data_label
+0+00bc <[^>]*> nop
+0+00c0 <[^>]*> addiu \$a0,\$a0,1
+0+00c4 <[^>]*> lui \$a0,0x0
+[ ]*c4: R_MIPS_GOT_HI16 small_external_data_label
+0+00c8 <[^>]*> addu \$a0,\$a0,\$gp
+0+00cc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*cc: R_MIPS_GOT_LO16 small_external_data_label
+0+00d0 <[^>]*> nop
+0+00d4 <[^>]*> addiu \$a0,\$a0,1
+0+00d8 <[^>]*> lui \$a0,0x0
+[ ]*d8: R_MIPS_GOT_HI16 big_external_common
+0+00dc <[^>]*> addu \$a0,\$a0,\$gp
+0+00e0 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*e0: R_MIPS_GOT_LO16 big_external_common
+0+00e4 <[^>]*> nop
+0+00e8 <[^>]*> addiu \$a0,\$a0,1
+0+00ec <[^>]*> lui \$a0,0x0
+[ ]*ec: R_MIPS_GOT_HI16 small_external_common
+0+00f0 <[^>]*> addu \$a0,\$a0,\$gp
+0+00f4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*f4: R_MIPS_GOT_LO16 small_external_common
+0+00f8 <[^>]*> nop
+0+00fc <[^>]*> addiu \$a0,\$a0,1
+0+0100 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*100: R_MIPS_GOT16 .bss
+0+0104 <[^>]*> nop
+0+0108 <[^>]*> addiu \$a0,\$a0,1
+[ ]*108: R_MIPS_LO16 .bss
+0+010c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*10c: R_MIPS_GOT16 .bss
+0+0110 <[^>]*> nop
+0+0114 <[^>]*> addiu \$a0,\$a0,1001
+[ ]*114: R_MIPS_LO16 .bss
+0+0118 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*118: R_MIPS_GOT16 .data
+0+011c <[^>]*> lui \$at,0x1
+0+0120 <[^>]*> addiu \$at,\$at,-32768
+[ ]*120: R_MIPS_LO16 .data
+0+0124 <[^>]*> addu \$a0,\$a0,\$at
+0+0128 <[^>]*> lui \$a0,0x0
+[ ]*128: R_MIPS_GOT_HI16 big_external_data_label
+0+012c <[^>]*> addu \$a0,\$a0,\$gp
+0+0130 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*130: R_MIPS_GOT_LO16 big_external_data_label
+0+0134 <[^>]*> lui \$at,0x1
+0+0138 <[^>]*> addiu \$at,\$at,-32768
+0+013c <[^>]*> addu \$a0,\$a0,\$at
+0+0140 <[^>]*> lui \$a0,0x0
+[ ]*140: R_MIPS_GOT_HI16 small_external_data_label
+0+0144 <[^>]*> addu \$a0,\$a0,\$gp
+0+0148 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*148: R_MIPS_GOT_LO16 small_external_data_label
+0+014c <[^>]*> lui \$at,0x1
+0+0150 <[^>]*> addiu \$at,\$at,-32768
+0+0154 <[^>]*> addu \$a0,\$a0,\$at
+0+0158 <[^>]*> lui \$a0,0x0
+[ ]*158: R_MIPS_GOT_HI16 big_external_common
+0+015c <[^>]*> addu \$a0,\$a0,\$gp
+0+0160 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*160: R_MIPS_GOT_LO16 big_external_common
+0+0164 <[^>]*> lui \$at,0x1
+0+0168 <[^>]*> addiu \$at,\$at,-32768
+0+016c <[^>]*> addu \$a0,\$a0,\$at
+0+0170 <[^>]*> lui \$a0,0x0
+[ ]*170: R_MIPS_GOT_HI16 small_external_common
+0+0174 <[^>]*> addu \$a0,\$a0,\$gp
+0+0178 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*178: R_MIPS_GOT_LO16 small_external_common
+0+017c <[^>]*> lui \$at,0x1
+0+0180 <[^>]*> addiu \$at,\$at,-32768
+0+0184 <[^>]*> addu \$a0,\$a0,\$at
+0+0188 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*188: R_MIPS_GOT16 .bss
+0+018c <[^>]*> lui \$at,0x1
+0+0190 <[^>]*> addiu \$at,\$at,-32768
+[ ]*190: R_MIPS_LO16 .bss
+0+0194 <[^>]*> addu \$a0,\$a0,\$at
+0+0198 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*198: R_MIPS_GOT16 .bss
+0+019c <[^>]*> lui \$at,0x1
+0+01a0 <[^>]*> addiu \$at,\$at,-31768
+[ ]*1a0: R_MIPS_LO16 .bss
+0+01a4 <[^>]*> addu \$a0,\$a0,\$at
+0+01a8 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*1a8: R_MIPS_GOT16 .data
+0+01ac <[^>]*> nop
+0+01b0 <[^>]*> addiu \$a0,\$a0,-32768
+[ ]*1b0: R_MIPS_LO16 .data
+0+01b4 <[^>]*> lui \$a0,0x0
+[ ]*1b4: R_MIPS_GOT_HI16 big_external_data_label
+0+01b8 <[^>]*> addu \$a0,\$a0,\$gp
+0+01bc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1bc: R_MIPS_GOT_LO16 big_external_data_label
+0+01c0 <[^>]*> nop
+0+01c4 <[^>]*> addiu \$a0,\$a0,-32768
+0+01c8 <[^>]*> lui \$a0,0x0
+[ ]*1c8: R_MIPS_GOT_HI16 small_external_data_label
+0+01cc <[^>]*> addu \$a0,\$a0,\$gp
+0+01d0 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1d0: R_MIPS_GOT_LO16 small_external_data_label
+0+01d4 <[^>]*> nop
+0+01d8 <[^>]*> addiu \$a0,\$a0,-32768
+0+01dc <[^>]*> lui \$a0,0x0
+[ ]*1dc: R_MIPS_GOT_HI16 big_external_common
+0+01e0 <[^>]*> addu \$a0,\$a0,\$gp
+0+01e4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1e4: R_MIPS_GOT_LO16 big_external_common
+0+01e8 <[^>]*> nop
+0+01ec <[^>]*> addiu \$a0,\$a0,-32768
+0+01f0 <[^>]*> lui \$a0,0x0
+[ ]*1f0: R_MIPS_GOT_HI16 small_external_common
+0+01f4 <[^>]*> addu \$a0,\$a0,\$gp
+0+01f8 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1f8: R_MIPS_GOT_LO16 small_external_common
+0+01fc <[^>]*> nop
+0+0200 <[^>]*> addiu \$a0,\$a0,-32768
+0+0204 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*204: R_MIPS_GOT16 .bss
+0+0208 <[^>]*> nop
+0+020c <[^>]*> addiu \$a0,\$a0,-32768
+[ ]*20c: R_MIPS_LO16 .bss
+0+0210 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*210: R_MIPS_GOT16 .bss
+0+0214 <[^>]*> nop
+0+0218 <[^>]*> addiu \$a0,\$a0,-31768
+[ ]*218: R_MIPS_LO16 .bss
+0+021c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*21c: R_MIPS_GOT16 .data
+0+0220 <[^>]*> lui \$at,0x1
+0+0224 <[^>]*> addiu \$at,\$at,0
+[ ]*224: R_MIPS_LO16 .data
+0+0228 <[^>]*> addu \$a0,\$a0,\$at
+0+022c <[^>]*> lui \$a0,0x0
+[ ]*22c: R_MIPS_GOT_HI16 big_external_data_label
+0+0230 <[^>]*> addu \$a0,\$a0,\$gp
+0+0234 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*234: R_MIPS_GOT_LO16 big_external_data_label
+0+0238 <[^>]*> lui \$at,0x1
+0+023c <[^>]*> addiu \$at,\$at,0
+0+0240 <[^>]*> addu \$a0,\$a0,\$at
+0+0244 <[^>]*> lui \$a0,0x0
+[ ]*244: R_MIPS_GOT_HI16 small_external_data_label
+0+0248 <[^>]*> addu \$a0,\$a0,\$gp
+0+024c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*24c: R_MIPS_GOT_LO16 small_external_data_label
+0+0250 <[^>]*> lui \$at,0x1
+0+0254 <[^>]*> addiu \$at,\$at,0
+0+0258 <[^>]*> addu \$a0,\$a0,\$at
+0+025c <[^>]*> lui \$a0,0x0
+[ ]*25c: R_MIPS_GOT_HI16 big_external_common
+0+0260 <[^>]*> addu \$a0,\$a0,\$gp
+0+0264 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*264: R_MIPS_GOT_LO16 big_external_common
+0+0268 <[^>]*> lui \$at,0x1
+0+026c <[^>]*> addiu \$at,\$at,0
+0+0270 <[^>]*> addu \$a0,\$a0,\$at
+0+0274 <[^>]*> lui \$a0,0x0
+[ ]*274: R_MIPS_GOT_HI16 small_external_common
+0+0278 <[^>]*> addu \$a0,\$a0,\$gp
+0+027c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*27c: R_MIPS_GOT_LO16 small_external_common
+0+0280 <[^>]*> lui \$at,0x1
+0+0284 <[^>]*> addiu \$at,\$at,0
+0+0288 <[^>]*> addu \$a0,\$a0,\$at
+0+028c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*28c: R_MIPS_GOT16 .bss
+0+0290 <[^>]*> lui \$at,0x1
+0+0294 <[^>]*> addiu \$at,\$at,0
+[ ]*294: R_MIPS_LO16 .bss
+0+0298 <[^>]*> addu \$a0,\$a0,\$at
+0+029c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*29c: R_MIPS_GOT16 .bss
+0+02a0 <[^>]*> lui \$at,0x1
+0+02a4 <[^>]*> addiu \$at,\$at,1000
+[ ]*2a4: R_MIPS_LO16 .bss
+0+02a8 <[^>]*> addu \$a0,\$a0,\$at
+0+02ac <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*2ac: R_MIPS_GOT16 .data
+0+02b0 <[^>]*> lui \$at,0x2
+0+02b4 <[^>]*> addiu \$at,\$at,-23131
+[ ]*2b4: R_MIPS_LO16 .data
+0+02b8 <[^>]*> addu \$a0,\$a0,\$at
+0+02bc <[^>]*> lui \$a0,0x0
+[ ]*2bc: R_MIPS_GOT_HI16 big_external_data_label
+0+02c0 <[^>]*> addu \$a0,\$a0,\$gp
+0+02c4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*2c4: R_MIPS_GOT_LO16 big_external_data_label
+0+02c8 <[^>]*> lui \$at,0x2
+0+02cc <[^>]*> addiu \$at,\$at,-23131
+0+02d0 <[^>]*> addu \$a0,\$a0,\$at
+0+02d4 <[^>]*> lui \$a0,0x0
+[ ]*2d4: R_MIPS_GOT_HI16 small_external_data_label
+0+02d8 <[^>]*> addu \$a0,\$a0,\$gp
+0+02dc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*2dc: R_MIPS_GOT_LO16 small_external_data_label
+0+02e0 <[^>]*> lui \$at,0x2
+0+02e4 <[^>]*> addiu \$at,\$at,-23131
+0+02e8 <[^>]*> addu \$a0,\$a0,\$at
+0+02ec <[^>]*> lui \$a0,0x0
+[ ]*2ec: R_MIPS_GOT_HI16 big_external_common
+0+02f0 <[^>]*> addu \$a0,\$a0,\$gp
+0+02f4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*2f4: R_MIPS_GOT_LO16 big_external_common
+0+02f8 <[^>]*> lui \$at,0x2
+0+02fc <[^>]*> addiu \$at,\$at,-23131
+0+0300 <[^>]*> addu \$a0,\$a0,\$at
+0+0304 <[^>]*> lui \$a0,0x0
+[ ]*304: R_MIPS_GOT_HI16 small_external_common
+0+0308 <[^>]*> addu \$a0,\$a0,\$gp
+0+030c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*30c: R_MIPS_GOT_LO16 small_external_common
+0+0310 <[^>]*> lui \$at,0x2
+0+0314 <[^>]*> addiu \$at,\$at,-23131
+0+0318 <[^>]*> addu \$a0,\$a0,\$at
+0+031c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*31c: R_MIPS_GOT16 .bss
+0+0320 <[^>]*> lui \$at,0x2
+0+0324 <[^>]*> addiu \$at,\$at,-23131
+[ ]*324: R_MIPS_LO16 .bss
+0+0328 <[^>]*> addu \$a0,\$a0,\$at
+0+032c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*32c: R_MIPS_GOT16 .bss
+0+0330 <[^>]*> lui \$at,0x2
+0+0334 <[^>]*> addiu \$at,\$at,-22131
+[ ]*334: R_MIPS_LO16 .bss
+0+0338 <[^>]*> addu \$a0,\$a0,\$at
+0+033c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*33c: R_MIPS_GOT16 .data
+0+0340 <[^>]*> nop
+0+0344 <[^>]*> addiu \$a0,\$a0,0
+[ ]*344: R_MIPS_LO16 .data
+0+0348 <[^>]*> addu \$a0,\$a0,\$a1
+0+034c <[^>]*> lui \$a0,0x0
+[ ]*34c: R_MIPS_GOT_HI16 big_external_data_label
+0+0350 <[^>]*> addu \$a0,\$a0,\$gp
+0+0354 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*354: R_MIPS_GOT_LO16 big_external_data_label
+0+0358 <[^>]*> nop
+0+035c <[^>]*> addu \$a0,\$a0,\$a1
+0+0360 <[^>]*> lui \$a0,0x0
+[ ]*360: R_MIPS_GOT_HI16 small_external_data_label
+0+0364 <[^>]*> addu \$a0,\$a0,\$gp
+0+0368 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*368: R_MIPS_GOT_LO16 small_external_data_label
+0+036c <[^>]*> nop
+0+0370 <[^>]*> addu \$a0,\$a0,\$a1
+0+0374 <[^>]*> lui \$a0,0x0
+[ ]*374: R_MIPS_GOT_HI16 big_external_common
+0+0378 <[^>]*> addu \$a0,\$a0,\$gp
+0+037c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*37c: R_MIPS_GOT_LO16 big_external_common
+0+0380 <[^>]*> nop
+0+0384 <[^>]*> addu \$a0,\$a0,\$a1
+0+0388 <[^>]*> lui \$a0,0x0
+[ ]*388: R_MIPS_GOT_HI16 small_external_common
+0+038c <[^>]*> addu \$a0,\$a0,\$gp
+0+0390 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*390: R_MIPS_GOT_LO16 small_external_common
+0+0394 <[^>]*> nop
+0+0398 <[^>]*> addu \$a0,\$a0,\$a1
+0+039c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*39c: R_MIPS_GOT16 .bss
+0+03a0 <[^>]*> nop
+0+03a4 <[^>]*> addiu \$a0,\$a0,0
+[ ]*3a4: R_MIPS_LO16 .bss
+0+03a8 <[^>]*> addu \$a0,\$a0,\$a1
+0+03ac <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*3ac: R_MIPS_GOT16 .bss
+0+03b0 <[^>]*> nop
+0+03b4 <[^>]*> addiu \$a0,\$a0,1000
+[ ]*3b4: R_MIPS_LO16 .bss
+0+03b8 <[^>]*> addu \$a0,\$a0,\$a1
+0+03bc <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*3bc: R_MIPS_GOT16 .data
+0+03c0 <[^>]*> nop
+0+03c4 <[^>]*> addiu \$a0,\$a0,1
+[ ]*3c4: R_MIPS_LO16 .data
+0+03c8 <[^>]*> addu \$a0,\$a0,\$a1
+0+03cc <[^>]*> lui \$a0,0x0
+[ ]*3cc: R_MIPS_GOT_HI16 big_external_data_label
+0+03d0 <[^>]*> addu \$a0,\$a0,\$gp
+0+03d4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*3d4: R_MIPS_GOT_LO16 big_external_data_label
+0+03d8 <[^>]*> nop
+0+03dc <[^>]*> addiu \$a0,\$a0,1
+0+03e0 <[^>]*> addu \$a0,\$a0,\$a1
+0+03e4 <[^>]*> lui \$a0,0x0
+[ ]*3e4: R_MIPS_GOT_HI16 small_external_data_label
+0+03e8 <[^>]*> addu \$a0,\$a0,\$gp
+0+03ec <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*3ec: R_MIPS_GOT_LO16 small_external_data_label
+0+03f0 <[^>]*> nop
+0+03f4 <[^>]*> addiu \$a0,\$a0,1
+0+03f8 <[^>]*> addu \$a0,\$a0,\$a1
+0+03fc <[^>]*> lui \$a0,0x0
+[ ]*3fc: R_MIPS_GOT_HI16 big_external_common
+0+0400 <[^>]*> addu \$a0,\$a0,\$gp
+0+0404 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*404: R_MIPS_GOT_LO16 big_external_common
+0+0408 <[^>]*> nop
+0+040c <[^>]*> addiu \$a0,\$a0,1
+0+0410 <[^>]*> addu \$a0,\$a0,\$a1
+0+0414 <[^>]*> lui \$a0,0x0
+[ ]*414: R_MIPS_GOT_HI16 small_external_common
+0+0418 <[^>]*> addu \$a0,\$a0,\$gp
+0+041c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*41c: R_MIPS_GOT_LO16 small_external_common
+0+0420 <[^>]*> nop
+0+0424 <[^>]*> addiu \$a0,\$a0,1
+0+0428 <[^>]*> addu \$a0,\$a0,\$a1
+0+042c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*42c: R_MIPS_GOT16 .bss
+0+0430 <[^>]*> nop
+0+0434 <[^>]*> addiu \$a0,\$a0,1
+[ ]*434: R_MIPS_LO16 .bss
+0+0438 <[^>]*> addu \$a0,\$a0,\$a1
+0+043c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*43c: R_MIPS_GOT16 .bss
+0+0440 <[^>]*> nop
+0+0444 <[^>]*> addiu \$a0,\$a0,1001
+[ ]*444: R_MIPS_LO16 .bss
+0+0448 <[^>]*> addu \$a0,\$a0,\$a1
+0+044c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*44c: R_MIPS_GOT16 .data
+0+0450 <[^>]*> lui \$at,0x1
+0+0454 <[^>]*> addiu \$at,\$at,-32768
+[ ]*454: R_MIPS_LO16 .data
+0+0458 <[^>]*> addu \$a0,\$a0,\$at
+0+045c <[^>]*> addu \$a0,\$a0,\$a1
+0+0460 <[^>]*> lui \$a0,0x0
+[ ]*460: R_MIPS_GOT_HI16 big_external_data_label
+0+0464 <[^>]*> addu \$a0,\$a0,\$gp
+0+0468 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*468: R_MIPS_GOT_LO16 big_external_data_label
+0+046c <[^>]*> lui \$at,0x1
+0+0470 <[^>]*> addiu \$at,\$at,-32768
+0+0474 <[^>]*> addu \$a0,\$a0,\$at
+0+0478 <[^>]*> addu \$a0,\$a0,\$a1
+0+047c <[^>]*> lui \$a0,0x0
+[ ]*47c: R_MIPS_GOT_HI16 small_external_data_label
+0+0480 <[^>]*> addu \$a0,\$a0,\$gp
+0+0484 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*484: R_MIPS_GOT_LO16 small_external_data_label
+0+0488 <[^>]*> lui \$at,0x1
+0+048c <[^>]*> addiu \$at,\$at,-32768
+0+0490 <[^>]*> addu \$a0,\$a0,\$at
+0+0494 <[^>]*> addu \$a0,\$a0,\$a1
+0+0498 <[^>]*> lui \$a0,0x0
+[ ]*498: R_MIPS_GOT_HI16 big_external_common
+0+049c <[^>]*> addu \$a0,\$a0,\$gp
+0+04a0 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*4a0: R_MIPS_GOT_LO16 big_external_common
+0+04a4 <[^>]*> lui \$at,0x1
+0+04a8 <[^>]*> addiu \$at,\$at,-32768
+0+04ac <[^>]*> addu \$a0,\$a0,\$at
+0+04b0 <[^>]*> addu \$a0,\$a0,\$a1
+0+04b4 <[^>]*> lui \$a0,0x0
+[ ]*4b4: R_MIPS_GOT_HI16 small_external_common
+0+04b8 <[^>]*> addu \$a0,\$a0,\$gp
+0+04bc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*4bc: R_MIPS_GOT_LO16 small_external_common
+0+04c0 <[^>]*> lui \$at,0x1
+0+04c4 <[^>]*> addiu \$at,\$at,-32768
+0+04c8 <[^>]*> addu \$a0,\$a0,\$at
+0+04cc <[^>]*> addu \$a0,\$a0,\$a1
+0+04d0 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*4d0: R_MIPS_GOT16 .bss
+0+04d4 <[^>]*> lui \$at,0x1
+0+04d8 <[^>]*> addiu \$at,\$at,-32768
+[ ]*4d8: R_MIPS_LO16 .bss
+0+04dc <[^>]*> addu \$a0,\$a0,\$at
+0+04e0 <[^>]*> addu \$a0,\$a0,\$a1
+0+04e4 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*4e4: R_MIPS_GOT16 .bss
+0+04e8 <[^>]*> lui \$at,0x1
+0+04ec <[^>]*> addiu \$at,\$at,-31768
+[ ]*4ec: R_MIPS_LO16 .bss
+0+04f0 <[^>]*> addu \$a0,\$a0,\$at
+0+04f4 <[^>]*> addu \$a0,\$a0,\$a1
+0+04f8 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*4f8: R_MIPS_GOT16 .data
+0+04fc <[^>]*> nop
+0+0500 <[^>]*> addiu \$a0,\$a0,-32768
+[ ]*500: R_MIPS_LO16 .data
+0+0504 <[^>]*> addu \$a0,\$a0,\$a1
+0+0508 <[^>]*> lui \$a0,0x0
+[ ]*508: R_MIPS_GOT_HI16 big_external_data_label
+0+050c <[^>]*> addu \$a0,\$a0,\$gp
+0+0510 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*510: R_MIPS_GOT_LO16 big_external_data_label
+0+0514 <[^>]*> nop
+0+0518 <[^>]*> addiu \$a0,\$a0,-32768
+0+051c <[^>]*> addu \$a0,\$a0,\$a1
+0+0520 <[^>]*> lui \$a0,0x0
+[ ]*520: R_MIPS_GOT_HI16 small_external_data_label
+0+0524 <[^>]*> addu \$a0,\$a0,\$gp
+0+0528 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*528: R_MIPS_GOT_LO16 small_external_data_label
+0+052c <[^>]*> nop
+0+0530 <[^>]*> addiu \$a0,\$a0,-32768
+0+0534 <[^>]*> addu \$a0,\$a0,\$a1
+0+0538 <[^>]*> lui \$a0,0x0
+[ ]*538: R_MIPS_GOT_HI16 big_external_common
+0+053c <[^>]*> addu \$a0,\$a0,\$gp
+0+0540 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*540: R_MIPS_GOT_LO16 big_external_common
+0+0544 <[^>]*> nop
+0+0548 <[^>]*> addiu \$a0,\$a0,-32768
+0+054c <[^>]*> addu \$a0,\$a0,\$a1
+0+0550 <[^>]*> lui \$a0,0x0
+[ ]*550: R_MIPS_GOT_HI16 small_external_common
+0+0554 <[^>]*> addu \$a0,\$a0,\$gp
+0+0558 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*558: R_MIPS_GOT_LO16 small_external_common
+0+055c <[^>]*> nop
+0+0560 <[^>]*> addiu \$a0,\$a0,-32768
+0+0564 <[^>]*> addu \$a0,\$a0,\$a1
+0+0568 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*568: R_MIPS_GOT16 .bss
+0+056c <[^>]*> nop
+0+0570 <[^>]*> addiu \$a0,\$a0,-32768
+[ ]*570: R_MIPS_LO16 .bss
+0+0574 <[^>]*> addu \$a0,\$a0,\$a1
+0+0578 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*578: R_MIPS_GOT16 .bss
+0+057c <[^>]*> nop
+0+0580 <[^>]*> addiu \$a0,\$a0,-31768
+[ ]*580: R_MIPS_LO16 .bss
+0+0584 <[^>]*> addu \$a0,\$a0,\$a1
+0+0588 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*588: R_MIPS_GOT16 .data
+0+058c <[^>]*> lui \$at,0x1
+0+0590 <[^>]*> addiu \$at,\$at,0
+[ ]*590: R_MIPS_LO16 .data
+0+0594 <[^>]*> addu \$a0,\$a0,\$at
+0+0598 <[^>]*> addu \$a0,\$a0,\$a1
+0+059c <[^>]*> lui \$a0,0x0
+[ ]*59c: R_MIPS_GOT_HI16 big_external_data_label
+0+05a0 <[^>]*> addu \$a0,\$a0,\$gp
+0+05a4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*5a4: R_MIPS_GOT_LO16 big_external_data_label
+0+05a8 <[^>]*> lui \$at,0x1
+0+05ac <[^>]*> addiu \$at,\$at,0
+0+05b0 <[^>]*> addu \$a0,\$a0,\$at
+0+05b4 <[^>]*> addu \$a0,\$a0,\$a1
+0+05b8 <[^>]*> lui \$a0,0x0
+[ ]*5b8: R_MIPS_GOT_HI16 small_external_data_label
+0+05bc <[^>]*> addu \$a0,\$a0,\$gp
+0+05c0 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*5c0: R_MIPS_GOT_LO16 small_external_data_label
+0+05c4 <[^>]*> lui \$at,0x1
+0+05c8 <[^>]*> addiu \$at,\$at,0
+0+05cc <[^>]*> addu \$a0,\$a0,\$at
+0+05d0 <[^>]*> addu \$a0,\$a0,\$a1
+0+05d4 <[^>]*> lui \$a0,0x0
+[ ]*5d4: R_MIPS_GOT_HI16 big_external_common
+0+05d8 <[^>]*> addu \$a0,\$a0,\$gp
+0+05dc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*5dc: R_MIPS_GOT_LO16 big_external_common
+0+05e0 <[^>]*> lui \$at,0x1
+0+05e4 <[^>]*> addiu \$at,\$at,0
+0+05e8 <[^>]*> addu \$a0,\$a0,\$at
+0+05ec <[^>]*> addu \$a0,\$a0,\$a1
+0+05f0 <[^>]*> lui \$a0,0x0
+[ ]*5f0: R_MIPS_GOT_HI16 small_external_common
+0+05f4 <[^>]*> addu \$a0,\$a0,\$gp
+0+05f8 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*5f8: R_MIPS_GOT_LO16 small_external_common
+0+05fc <[^>]*> lui \$at,0x1
+0+0600 <[^>]*> addiu \$at,\$at,0
+0+0604 <[^>]*> addu \$a0,\$a0,\$at
+0+0608 <[^>]*> addu \$a0,\$a0,\$a1
+0+060c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*60c: R_MIPS_GOT16 .bss
+0+0610 <[^>]*> lui \$at,0x1
+0+0614 <[^>]*> addiu \$at,\$at,0
+[ ]*614: R_MIPS_LO16 .bss
+0+0618 <[^>]*> addu \$a0,\$a0,\$at
+0+061c <[^>]*> addu \$a0,\$a0,\$a1
+0+0620 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*620: R_MIPS_GOT16 .bss
+0+0624 <[^>]*> lui \$at,0x1
+0+0628 <[^>]*> addiu \$at,\$at,1000
+[ ]*628: R_MIPS_LO16 .bss
+0+062c <[^>]*> addu \$a0,\$a0,\$at
+0+0630 <[^>]*> addu \$a0,\$a0,\$a1
+0+0634 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*634: R_MIPS_GOT16 .data
+0+0638 <[^>]*> lui \$at,0x2
+0+063c <[^>]*> addiu \$at,\$at,-23131
+[ ]*63c: R_MIPS_LO16 .data
+0+0640 <[^>]*> addu \$a0,\$a0,\$at
+0+0644 <[^>]*> addu \$a0,\$a0,\$a1
+0+0648 <[^>]*> lui \$a0,0x0
+[ ]*648: R_MIPS_GOT_HI16 big_external_data_label
+0+064c <[^>]*> addu \$a0,\$a0,\$gp
+0+0650 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*650: R_MIPS_GOT_LO16 big_external_data_label
+0+0654 <[^>]*> lui \$at,0x2
+0+0658 <[^>]*> addiu \$at,\$at,-23131
+0+065c <[^>]*> addu \$a0,\$a0,\$at
+0+0660 <[^>]*> addu \$a0,\$a0,\$a1
+0+0664 <[^>]*> lui \$a0,0x0
+[ ]*664: R_MIPS_GOT_HI16 small_external_data_label
+0+0668 <[^>]*> addu \$a0,\$a0,\$gp
+0+066c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*66c: R_MIPS_GOT_LO16 small_external_data_label
+0+0670 <[^>]*> lui \$at,0x2
+0+0674 <[^>]*> addiu \$at,\$at,-23131
+0+0678 <[^>]*> addu \$a0,\$a0,\$at
+0+067c <[^>]*> addu \$a0,\$a0,\$a1
+0+0680 <[^>]*> lui \$a0,0x0
+[ ]*680: R_MIPS_GOT_HI16 big_external_common
+0+0684 <[^>]*> addu \$a0,\$a0,\$gp
+0+0688 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*688: R_MIPS_GOT_LO16 big_external_common
+0+068c <[^>]*> lui \$at,0x2
+0+0690 <[^>]*> addiu \$at,\$at,-23131
+0+0694 <[^>]*> addu \$a0,\$a0,\$at
+0+0698 <[^>]*> addu \$a0,\$a0,\$a1
+0+069c <[^>]*> lui \$a0,0x0
+[ ]*69c: R_MIPS_GOT_HI16 small_external_common
+0+06a0 <[^>]*> addu \$a0,\$a0,\$gp
+0+06a4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*6a4: R_MIPS_GOT_LO16 small_external_common
+0+06a8 <[^>]*> lui \$at,0x2
+0+06ac <[^>]*> addiu \$at,\$at,-23131
+0+06b0 <[^>]*> addu \$a0,\$a0,\$at
+0+06b4 <[^>]*> addu \$a0,\$a0,\$a1
+0+06b8 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*6b8: R_MIPS_GOT16 .bss
+0+06bc <[^>]*> lui \$at,0x2
+0+06c0 <[^>]*> addiu \$at,\$at,-23131
+[ ]*6c0: R_MIPS_LO16 .bss
+0+06c4 <[^>]*> addu \$a0,\$a0,\$at
+0+06c8 <[^>]*> addu \$a0,\$a0,\$a1
+0+06cc <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*6cc: R_MIPS_GOT16 .bss
+0+06d0 <[^>]*> lui \$at,0x2
+0+06d4 <[^>]*> addiu \$at,\$at,-22131
+[ ]*6d4: R_MIPS_LO16 .bss
+0+06d8 <[^>]*> addu \$a0,\$a0,\$at
+0+06dc <[^>]*> addu \$a0,\$a0,\$a1
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lb-xgot.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lb-xgot.d
index f42d3139ff4..55679c4cedc 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lb-xgot.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lb-xgot.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS lb-xgot
#as: -mips1 -KPIC -xgot
#source: lb-pic.s
@@ -8,235 +8,235 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> lb \$a0,0\(\$zero\)
-0+0004 <[^>]*> lb \$a0,1\(\$zero\)
-0+0008 <[^>]*> lui \$a0,0x1
-0+000c <[^>]*> lb \$a0,-32768\(\$a0\)
-0+0010 <[^>]*> lb \$a0,-32768\(\$zero\)
-0+0014 <[^>]*> lui \$a0,0x1
-0+0018 <[^>]*> lb \$a0,0\(\$a0\)
-0+001c <[^>]*> lui \$a0,0x2
-0+0020 <[^>]*> lb \$a0,-23131\(\$a0\)
-0+0024 <[^>]*> lb \$a0,0\(\$a1\)
-0+0028 <[^>]*> lb \$a0,1\(\$a1\)
-0+002c <[^>]*> lui \$a0,0x1
-0+0030 <[^>]*> addu \$a0,\$a0,\$a1
-0+0034 <[^>]*> lb \$a0,-32768\(\$a0\)
-0+0038 <[^>]*> lb \$a0,-32768\(\$a1\)
-0+003c <[^>]*> lui \$a0,0x1
-0+0040 <[^>]*> addu \$a0,\$a0,\$a1
-0+0044 <[^>]*> lb \$a0,0\(\$a0\)
-0+0048 <[^>]*> lui \$a0,0x2
-0+004c <[^>]*> addu \$a0,\$a0,\$a1
-0+0050 <[^>]*> lb \$a0,-23131\(\$a0\)
-0+0054 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0054 R_MIPS_GOT16 .data
-...
-0+005c <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+005c R_MIPS_LO16 .data
-...
-0+0064 <[^>]*> lb \$a0,0\(\$a0\)
-0+0068 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0068 R_MIPS_GOT_HI16 big_external_data_label
-0+006c <[^>]*> addu \$a0,\$a0,\$gp
-0+0070 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0070 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0078 <[^>]*> lb \$a0,0\(\$a0\)
-0+007c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+007c R_MIPS_GOT_HI16 small_external_data_label
-0+0080 <[^>]*> addu \$a0,\$a0,\$gp
-0+0084 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0084 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+008c <[^>]*> lb \$a0,0\(\$a0\)
-0+0090 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0090 R_MIPS_GOT_HI16 big_external_common
-0+0094 <[^>]*> addu \$a0,\$a0,\$gp
-0+0098 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0098 R_MIPS_GOT_LO16 big_external_common
-...
-0+00a0 <[^>]*> lb \$a0,0\(\$a0\)
-0+00a4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+00a4 R_MIPS_GOT_HI16 small_external_common
-0+00a8 <[^>]*> addu \$a0,\$a0,\$gp
-0+00ac <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+00ac R_MIPS_GOT_LO16 small_external_common
-...
-0+00b4 <[^>]*> lb \$a0,0\(\$a0\)
-0+00b8 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+00b8 R_MIPS_GOT16 .bss
-...
-0+00c0 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+00c0 R_MIPS_LO16 .bss
-...
-0+00c8 <[^>]*> lb \$a0,0\(\$a0\)
-0+00cc <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+00cc R_MIPS_GOT16 .bss
-...
-0+00d4 <[^>]*> addiu \$a0,\$a0,1000
-[ ]*RELOC: 0+00d4 R_MIPS_LO16 .bss
-...
-0+00dc <[^>]*> lb \$a0,0\(\$a0\)
-0+00e0 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+00e0 R_MIPS_GOT16 .data
-...
-0+00e8 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+00e8 R_MIPS_LO16 .data
-...
-0+00f0 <[^>]*> lb \$a0,1\(\$a0\)
-0+00f4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+00f4 R_MIPS_GOT_HI16 big_external_data_label
-0+00f8 <[^>]*> addu \$a0,\$a0,\$gp
-0+00fc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+00fc R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0104 <[^>]*> lb \$a0,1\(\$a0\)
-0+0108 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0108 R_MIPS_GOT_HI16 small_external_data_label
-0+010c <[^>]*> addu \$a0,\$a0,\$gp
-0+0110 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0110 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0118 <[^>]*> lb \$a0,1\(\$a0\)
-0+011c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+011c R_MIPS_GOT_HI16 big_external_common
-0+0120 <[^>]*> addu \$a0,\$a0,\$gp
-0+0124 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0124 R_MIPS_GOT_LO16 big_external_common
-...
-0+012c <[^>]*> lb \$a0,1\(\$a0\)
-0+0130 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0130 R_MIPS_GOT_HI16 small_external_common
-0+0134 <[^>]*> addu \$a0,\$a0,\$gp
-0+0138 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0138 R_MIPS_GOT_LO16 small_external_common
-...
-0+0140 <[^>]*> lb \$a0,1\(\$a0\)
-0+0144 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0144 R_MIPS_GOT16 .bss
-...
-0+014c <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+014c R_MIPS_LO16 .bss
-...
-0+0154 <[^>]*> lb \$a0,1\(\$a0\)
-0+0158 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0158 R_MIPS_GOT16 .bss
-...
-0+0160 <[^>]*> addiu \$a0,\$a0,1000
-[ ]*RELOC: 0+0160 R_MIPS_LO16 .bss
-...
-0+0168 <[^>]*> lb \$a0,1\(\$a0\)
-0+016c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+016c R_MIPS_GOT16 .data
-...
-0+0174 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+0174 R_MIPS_LO16 .data
-...
-0+017c <[^>]*> addu \$a0,\$a0,\$a1
-0+0180 <[^>]*> lb \$a0,0\(\$a0\)
-0+0184 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0184 R_MIPS_GOT_HI16 big_external_data_label
-0+0188 <[^>]*> addu \$a0,\$a0,\$gp
-0+018c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+018c R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0194 <[^>]*> addu \$a0,\$a0,\$a1
-0+0198 <[^>]*> lb \$a0,0\(\$a0\)
-0+019c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+019c R_MIPS_GOT_HI16 small_external_data_label
-0+01a0 <[^>]*> addu \$a0,\$a0,\$gp
-0+01a4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01a4 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+01ac <[^>]*> addu \$a0,\$a0,\$a1
-0+01b0 <[^>]*> lb \$a0,0\(\$a0\)
-0+01b4 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+01b4 R_MIPS_GOT_HI16 big_external_common
-0+01b8 <[^>]*> addu \$a0,\$a0,\$gp
-0+01bc <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01bc R_MIPS_GOT_LO16 big_external_common
-...
-0+01c4 <[^>]*> addu \$a0,\$a0,\$a1
-0+01c8 <[^>]*> lb \$a0,0\(\$a0\)
-0+01cc <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+01cc R_MIPS_GOT_HI16 small_external_common
-0+01d0 <[^>]*> addu \$a0,\$a0,\$gp
-0+01d4 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+01d4 R_MIPS_GOT_LO16 small_external_common
-...
-0+01dc <[^>]*> addu \$a0,\$a0,\$a1
-0+01e0 <[^>]*> lb \$a0,0\(\$a0\)
-0+01e4 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+01e4 R_MIPS_GOT16 .bss
-...
-0+01ec <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+01ec R_MIPS_LO16 .bss
-...
-0+01f4 <[^>]*> addu \$a0,\$a0,\$a1
-0+01f8 <[^>]*> lb \$a0,0\(\$a0\)
-0+01fc <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+01fc R_MIPS_GOT16 .bss
-...
-0+0204 <[^>]*> addiu \$a0,\$a0,1000
-[ ]*RELOC: 0+0204 R_MIPS_LO16 .bss
-...
-0+020c <[^>]*> addu \$a0,\$a0,\$a1
-0+0210 <[^>]*> lb \$a0,0\(\$a0\)
-0+0214 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+0214 R_MIPS_GOT16 .data
-...
-0+021c <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+021c R_MIPS_LO16 .data
-...
-0+0224 <[^>]*> addu \$a0,\$a0,\$a1
-0+0228 <[^>]*> lb \$a0,1\(\$a0\)
-0+022c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+022c R_MIPS_GOT_HI16 big_external_data_label
-0+0230 <[^>]*> addu \$a0,\$a0,\$gp
-0+0234 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0234 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+023c <[^>]*> addu \$a0,\$a0,\$a1
-0+0240 <[^>]*> lb \$a0,1\(\$a0\)
-0+0244 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0244 R_MIPS_GOT_HI16 small_external_data_label
-0+0248 <[^>]*> addu \$a0,\$a0,\$gp
-0+024c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+024c R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0254 <[^>]*> addu \$a0,\$a0,\$a1
-0+0258 <[^>]*> lb \$a0,1\(\$a0\)
-0+025c <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+025c R_MIPS_GOT_HI16 big_external_common
-0+0260 <[^>]*> addu \$a0,\$a0,\$gp
-0+0264 <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+0264 R_MIPS_GOT_LO16 big_external_common
-...
-0+026c <[^>]*> addu \$a0,\$a0,\$a1
-0+0270 <[^>]*> lb \$a0,1\(\$a0\)
-0+0274 <[^>]*> lui \$a0,0x0
-[ ]*RELOC: 0+0274 R_MIPS_GOT_HI16 small_external_common
-0+0278 <[^>]*> addu \$a0,\$a0,\$gp
-0+027c <[^>]*> lw \$a0,0\(\$a0\)
-[ ]*RELOC: 0+027c R_MIPS_GOT_LO16 small_external_common
-...
-0+0284 <[^>]*> addu \$a0,\$a0,\$a1
-0+0288 <[^>]*> lb \$a0,1\(\$a0\)
-0+028c <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+028c R_MIPS_GOT16 .bss
-...
-0+0294 <[^>]*> addiu \$a0,\$a0,0
-[ ]*RELOC: 0+0294 R_MIPS_LO16 .bss
-...
-0+029c <[^>]*> addu \$a0,\$a0,\$a1
-0+02a0 <[^>]*> lb \$a0,1\(\$a0\)
-0+02a4 <[^>]*> lw \$a0,0\(\$gp\)
-[ ]*RELOC: 0+02a4 R_MIPS_GOT16 .bss
-...
-0+02ac <[^>]*> addiu \$a0,\$a0,1000
-[ ]*RELOC: 0+02ac R_MIPS_LO16 .bss
-...
-0+02b4 <[^>]*> addu \$a0,\$a0,\$a1
-0+02b8 <[^>]*> lb \$a0,1\(\$a0\)
-...
+0+0000 <[^>]*> lb \$a0,0\(\$zero\)
+0+0004 <[^>]*> lb \$a0,1\(\$zero\)
+0+0008 <[^>]*> lui \$a0,0x1
+0+000c <[^>]*> lb \$a0,-32768\(\$a0\)
+0+0010 <[^>]*> lb \$a0,-32768\(\$zero\)
+0+0014 <[^>]*> lui \$a0,0x1
+0+0018 <[^>]*> lb \$a0,0\(\$a0\)
+0+001c <[^>]*> lui \$a0,0x2
+0+0020 <[^>]*> lb \$a0,-23131\(\$a0\)
+0+0024 <[^>]*> lb \$a0,0\(\$a1\)
+0+0028 <[^>]*> lb \$a0,1\(\$a1\)
+0+002c <[^>]*> lui \$a0,0x1
+0+0030 <[^>]*> addu \$a0,\$a0,\$a1
+0+0034 <[^>]*> lb \$a0,-32768\(\$a0\)
+0+0038 <[^>]*> lb \$a0,-32768\(\$a1\)
+0+003c <[^>]*> lui \$a0,0x1
+0+0040 <[^>]*> addu \$a0,\$a0,\$a1
+0+0044 <[^>]*> lb \$a0,0\(\$a0\)
+0+0048 <[^>]*> lui \$a0,0x2
+0+004c <[^>]*> addu \$a0,\$a0,\$a1
+0+0050 <[^>]*> lb \$a0,-23131\(\$a0\)
+0+0054 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*54: R_MIPS_GOT16 .data
+0+0058 <[^>]*> nop
+0+005c <[^>]*> addiu \$a0,\$a0,0
+[ ]*5c: R_MIPS_LO16 .data
+0+0060 <[^>]*> nop
+0+0064 <[^>]*> lb \$a0,0\(\$a0\)
+0+0068 <[^>]*> lui \$a0,0x0
+[ ]*68: R_MIPS_GOT_HI16 big_external_data_label
+0+006c <[^>]*> addu \$a0,\$a0,\$gp
+0+0070 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*70: R_MIPS_GOT_LO16 big_external_data_label
+0+0074 <[^>]*> nop
+0+0078 <[^>]*> lb \$a0,0\(\$a0\)
+0+007c <[^>]*> lui \$a0,0x0
+[ ]*7c: R_MIPS_GOT_HI16 small_external_data_label
+0+0080 <[^>]*> addu \$a0,\$a0,\$gp
+0+0084 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*84: R_MIPS_GOT_LO16 small_external_data_label
+0+0088 <[^>]*> nop
+0+008c <[^>]*> lb \$a0,0\(\$a0\)
+0+0090 <[^>]*> lui \$a0,0x0
+[ ]*90: R_MIPS_GOT_HI16 big_external_common
+0+0094 <[^>]*> addu \$a0,\$a0,\$gp
+0+0098 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*98: R_MIPS_GOT_LO16 big_external_common
+0+009c <[^>]*> nop
+0+00a0 <[^>]*> lb \$a0,0\(\$a0\)
+0+00a4 <[^>]*> lui \$a0,0x0
+[ ]*a4: R_MIPS_GOT_HI16 small_external_common
+0+00a8 <[^>]*> addu \$a0,\$a0,\$gp
+0+00ac <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*ac: R_MIPS_GOT_LO16 small_external_common
+0+00b0 <[^>]*> nop
+0+00b4 <[^>]*> lb \$a0,0\(\$a0\)
+0+00b8 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*b8: R_MIPS_GOT16 .bss
+0+00bc <[^>]*> nop
+0+00c0 <[^>]*> addiu \$a0,\$a0,0
+[ ]*c0: R_MIPS_LO16 .bss
+0+00c4 <[^>]*> nop
+0+00c8 <[^>]*> lb \$a0,0\(\$a0\)
+0+00cc <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*cc: R_MIPS_GOT16 .bss
+0+00d0 <[^>]*> nop
+0+00d4 <[^>]*> addiu \$a0,\$a0,1000
+[ ]*d4: R_MIPS_LO16 .bss
+0+00d8 <[^>]*> nop
+0+00dc <[^>]*> lb \$a0,0\(\$a0\)
+0+00e0 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*e0: R_MIPS_GOT16 .data
+0+00e4 <[^>]*> nop
+0+00e8 <[^>]*> addiu \$a0,\$a0,0
+[ ]*e8: R_MIPS_LO16 .data
+0+00ec <[^>]*> nop
+0+00f0 <[^>]*> lb \$a0,1\(\$a0\)
+0+00f4 <[^>]*> lui \$a0,0x0
+[ ]*f4: R_MIPS_GOT_HI16 big_external_data_label
+0+00f8 <[^>]*> addu \$a0,\$a0,\$gp
+0+00fc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*fc: R_MIPS_GOT_LO16 big_external_data_label
+0+0100 <[^>]*> nop
+0+0104 <[^>]*> lb \$a0,1\(\$a0\)
+0+0108 <[^>]*> lui \$a0,0x0
+[ ]*108: R_MIPS_GOT_HI16 small_external_data_label
+0+010c <[^>]*> addu \$a0,\$a0,\$gp
+0+0110 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*110: R_MIPS_GOT_LO16 small_external_data_label
+0+0114 <[^>]*> nop
+0+0118 <[^>]*> lb \$a0,1\(\$a0\)
+0+011c <[^>]*> lui \$a0,0x0
+[ ]*11c: R_MIPS_GOT_HI16 big_external_common
+0+0120 <[^>]*> addu \$a0,\$a0,\$gp
+0+0124 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*124: R_MIPS_GOT_LO16 big_external_common
+0+0128 <[^>]*> nop
+0+012c <[^>]*> lb \$a0,1\(\$a0\)
+0+0130 <[^>]*> lui \$a0,0x0
+[ ]*130: R_MIPS_GOT_HI16 small_external_common
+0+0134 <[^>]*> addu \$a0,\$a0,\$gp
+0+0138 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*138: R_MIPS_GOT_LO16 small_external_common
+0+013c <[^>]*> nop
+0+0140 <[^>]*> lb \$a0,1\(\$a0\)
+0+0144 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*144: R_MIPS_GOT16 .bss
+0+0148 <[^>]*> nop
+0+014c <[^>]*> addiu \$a0,\$a0,0
+[ ]*14c: R_MIPS_LO16 .bss
+0+0150 <[^>]*> nop
+0+0154 <[^>]*> lb \$a0,1\(\$a0\)
+0+0158 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*158: R_MIPS_GOT16 .bss
+0+015c <[^>]*> nop
+0+0160 <[^>]*> addiu \$a0,\$a0,1000
+[ ]*160: R_MIPS_LO16 .bss
+0+0164 <[^>]*> nop
+0+0168 <[^>]*> lb \$a0,1\(\$a0\)
+0+016c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*16c: R_MIPS_GOT16 .data
+0+0170 <[^>]*> nop
+0+0174 <[^>]*> addiu \$a0,\$a0,0
+[ ]*174: R_MIPS_LO16 .data
+0+0178 <[^>]*> nop
+0+017c <[^>]*> addu \$a0,\$a0,\$a1
+0+0180 <[^>]*> lb \$a0,0\(\$a0\)
+0+0184 <[^>]*> lui \$a0,0x0
+[ ]*184: R_MIPS_GOT_HI16 big_external_data_label
+0+0188 <[^>]*> addu \$a0,\$a0,\$gp
+0+018c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*18c: R_MIPS_GOT_LO16 big_external_data_label
+0+0190 <[^>]*> nop
+0+0194 <[^>]*> addu \$a0,\$a0,\$a1
+0+0198 <[^>]*> lb \$a0,0\(\$a0\)
+0+019c <[^>]*> lui \$a0,0x0
+[ ]*19c: R_MIPS_GOT_HI16 small_external_data_label
+0+01a0 <[^>]*> addu \$a0,\$a0,\$gp
+0+01a4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1a4: R_MIPS_GOT_LO16 small_external_data_label
+0+01a8 <[^>]*> nop
+0+01ac <[^>]*> addu \$a0,\$a0,\$a1
+0+01b0 <[^>]*> lb \$a0,0\(\$a0\)
+0+01b4 <[^>]*> lui \$a0,0x0
+[ ]*1b4: R_MIPS_GOT_HI16 big_external_common
+0+01b8 <[^>]*> addu \$a0,\$a0,\$gp
+0+01bc <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1bc: R_MIPS_GOT_LO16 big_external_common
+0+01c0 <[^>]*> nop
+0+01c4 <[^>]*> addu \$a0,\$a0,\$a1
+0+01c8 <[^>]*> lb \$a0,0\(\$a0\)
+0+01cc <[^>]*> lui \$a0,0x0
+[ ]*1cc: R_MIPS_GOT_HI16 small_external_common
+0+01d0 <[^>]*> addu \$a0,\$a0,\$gp
+0+01d4 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*1d4: R_MIPS_GOT_LO16 small_external_common
+0+01d8 <[^>]*> nop
+0+01dc <[^>]*> addu \$a0,\$a0,\$a1
+0+01e0 <[^>]*> lb \$a0,0\(\$a0\)
+0+01e4 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*1e4: R_MIPS_GOT16 .bss
+0+01e8 <[^>]*> nop
+0+01ec <[^>]*> addiu \$a0,\$a0,0
+[ ]*1ec: R_MIPS_LO16 .bss
+0+01f0 <[^>]*> nop
+0+01f4 <[^>]*> addu \$a0,\$a0,\$a1
+0+01f8 <[^>]*> lb \$a0,0\(\$a0\)
+0+01fc <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*1fc: R_MIPS_GOT16 .bss
+0+0200 <[^>]*> nop
+0+0204 <[^>]*> addiu \$a0,\$a0,1000
+[ ]*204: R_MIPS_LO16 .bss
+0+0208 <[^>]*> nop
+0+020c <[^>]*> addu \$a0,\$a0,\$a1
+0+0210 <[^>]*> lb \$a0,0\(\$a0\)
+0+0214 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*214: R_MIPS_GOT16 .data
+0+0218 <[^>]*> nop
+0+021c <[^>]*> addiu \$a0,\$a0,0
+[ ]*21c: R_MIPS_LO16 .data
+0+0220 <[^>]*> nop
+0+0224 <[^>]*> addu \$a0,\$a0,\$a1
+0+0228 <[^>]*> lb \$a0,1\(\$a0\)
+0+022c <[^>]*> lui \$a0,0x0
+[ ]*22c: R_MIPS_GOT_HI16 big_external_data_label
+0+0230 <[^>]*> addu \$a0,\$a0,\$gp
+0+0234 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*234: R_MIPS_GOT_LO16 big_external_data_label
+0+0238 <[^>]*> nop
+0+023c <[^>]*> addu \$a0,\$a0,\$a1
+0+0240 <[^>]*> lb \$a0,1\(\$a0\)
+0+0244 <[^>]*> lui \$a0,0x0
+[ ]*244: R_MIPS_GOT_HI16 small_external_data_label
+0+0248 <[^>]*> addu \$a0,\$a0,\$gp
+0+024c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*24c: R_MIPS_GOT_LO16 small_external_data_label
+0+0250 <[^>]*> nop
+0+0254 <[^>]*> addu \$a0,\$a0,\$a1
+0+0258 <[^>]*> lb \$a0,1\(\$a0\)
+0+025c <[^>]*> lui \$a0,0x0
+[ ]*25c: R_MIPS_GOT_HI16 big_external_common
+0+0260 <[^>]*> addu \$a0,\$a0,\$gp
+0+0264 <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*264: R_MIPS_GOT_LO16 big_external_common
+0+0268 <[^>]*> nop
+0+026c <[^>]*> addu \$a0,\$a0,\$a1
+0+0270 <[^>]*> lb \$a0,1\(\$a0\)
+0+0274 <[^>]*> lui \$a0,0x0
+[ ]*274: R_MIPS_GOT_HI16 small_external_common
+0+0278 <[^>]*> addu \$a0,\$a0,\$gp
+0+027c <[^>]*> lw \$a0,0\(\$a0\)
+[ ]*27c: R_MIPS_GOT_LO16 small_external_common
+0+0280 <[^>]*> nop
+0+0284 <[^>]*> addu \$a0,\$a0,\$a1
+0+0288 <[^>]*> lb \$a0,1\(\$a0\)
+0+028c <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*28c: R_MIPS_GOT16 .bss
+0+0290 <[^>]*> nop
+0+0294 <[^>]*> addiu \$a0,\$a0,0
+[ ]*294: R_MIPS_LO16 .bss
+0+0298 <[^>]*> nop
+0+029c <[^>]*> addu \$a0,\$a0,\$a1
+0+02a0 <[^>]*> lb \$a0,1\(\$a0\)
+0+02a4 <[^>]*> lw \$a0,0\(\$gp\)
+[ ]*2a4: R_MIPS_GOT16 .bss
+0+02a8 <[^>]*> nop
+0+02ac <[^>]*> addiu \$a0,\$a0,1000
+[ ]*2ac: R_MIPS_LO16 .bss
+0+02b0 <[^>]*> nop
+0+02b4 <[^>]*> addu \$a0,\$a0,\$a1
+0+02b8 <[^>]*> lb \$a0,1\(\$a0\)
+0+02bc <[^>]*> nop
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ld-xgot.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ld-xgot.d
index 822f033d9fe..3c30d98f857 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ld-xgot.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ld-xgot.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS ld-xgot
#as: -mips1 -KPIC -xgot
#source: ld-pic.s
@@ -8,266 +8,266 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> lw \$a0,0\(\$zero\)
-0+0004 <[^>]*> lw \$a1,4\(\$zero\)
-0+0008 <[^>]*> lw \$a0,1\(\$zero\)
-0+000c <[^>]*> lw \$a1,5\(\$zero\)
-0+0010 <[^>]*> lui \$at,0x1
-0+0014 <[^>]*> lw \$a0,-32768\(\$at\)
-0+0018 <[^>]*> lw \$a1,-32764\(\$at\)
-0+001c <[^>]*> lw \$a0,-32768\(\$zero\)
-0+0020 <[^>]*> lw \$a1,-32764\(\$zero\)
-0+0024 <[^>]*> lui \$at,0x1
-0+0028 <[^>]*> lw \$a0,0\(\$at\)
-0+002c <[^>]*> lw \$a1,4\(\$at\)
-0+0030 <[^>]*> lui \$at,0x2
-0+0034 <[^>]*> lw \$a0,-23131\(\$at\)
-0+0038 <[^>]*> lw \$a1,-23127\(\$at\)
-...
-0+0040 <[^>]*> lw \$a0,0\(\$a1\)
-0+0044 <[^>]*> lw \$a1,4\(\$a1\)
-...
-0+004c <[^>]*> lw \$a0,1\(\$a1\)
-0+0050 <[^>]*> lw \$a1,5\(\$a1\)
-0+0054 <[^>]*> lui \$at,0x1
-0+0058 <[^>]*> addu \$at,\$a1,\$at
-0+005c <[^>]*> lw \$a0,-32768\(\$at\)
-0+0060 <[^>]*> lw \$a1,-32764\(\$at\)
-...
-0+0068 <[^>]*> lw \$a0,-32768\(\$a1\)
-0+006c <[^>]*> lw \$a1,-32764\(\$a1\)
-0+0070 <[^>]*> lui \$at,0x1
-0+0074 <[^>]*> addu \$at,\$a1,\$at
-0+0078 <[^>]*> lw \$a0,0\(\$at\)
-0+007c <[^>]*> lw \$a1,4\(\$at\)
-0+0080 <[^>]*> lui \$at,0x2
-0+0084 <[^>]*> addu \$at,\$a1,\$at
-0+0088 <[^>]*> lw \$a0,-23131\(\$at\)
-0+008c <[^>]*> lw \$a1,-23127\(\$at\)
-0+0090 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0090 R_MIPS_GOT16 .data
-...
-0+0098 <[^>]*> lw \$a0,0\(\$at\)
-[ ]*RELOC: 0+0098 R_MIPS_LO16 .data
-0+009c <[^>]*> lw \$a1,4\(\$at\)
-[ ]*RELOC: 0+009c R_MIPS_LO16 .data
-0+00a0 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+00a0 R_MIPS_GOT_HI16 big_external_data_label
-0+00a4 <[^>]*> addu \$at,\$at,\$gp
-0+00a8 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+00a8 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+00b0 <[^>]*> lw \$a0,0\(\$at\)
-0+00b4 <[^>]*> lw \$a1,4\(\$at\)
-0+00b8 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+00b8 R_MIPS_GOT_HI16 small_external_data_label
-0+00bc <[^>]*> addu \$at,\$at,\$gp
-0+00c0 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+00c0 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+00c8 <[^>]*> lw \$a0,0\(\$at\)
-0+00cc <[^>]*> lw \$a1,4\(\$at\)
-0+00d0 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+00d0 R_MIPS_GOT_HI16 big_external_common
-0+00d4 <[^>]*> addu \$at,\$at,\$gp
-0+00d8 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+00d8 R_MIPS_GOT_LO16 big_external_common
-...
-0+00e0 <[^>]*> lw \$a0,0\(\$at\)
-0+00e4 <[^>]*> lw \$a1,4\(\$at\)
-0+00e8 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+00e8 R_MIPS_GOT_HI16 small_external_common
-0+00ec <[^>]*> addu \$at,\$at,\$gp
-0+00f0 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+00f0 R_MIPS_GOT_LO16 small_external_common
-...
-0+00f8 <[^>]*> lw \$a0,0\(\$at\)
-0+00fc <[^>]*> lw \$a1,4\(\$at\)
-0+0100 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0100 R_MIPS_GOT16 .bss
-...
-0+0108 <[^>]*> lw \$a0,0\(\$at\)
-[ ]*RELOC: 0+0108 R_MIPS_LO16 .bss
-0+010c <[^>]*> lw \$a1,4\(\$at\)
-[ ]*RELOC: 0+010c R_MIPS_LO16 .bss
-0+0110 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0110 R_MIPS_GOT16 .bss
-...
-0+0118 <[^>]*> lw \$a0,1000\(\$at\)
-[ ]*RELOC: 0+0118 R_MIPS_LO16 .bss
-0+011c <[^>]*> lw \$a1,1004\(\$at\)
-[ ]*RELOC: 0+011c R_MIPS_LO16 .bss
-0+0120 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0120 R_MIPS_GOT16 .data
-...
-0+0128 <[^>]*> lw \$a0,1\(\$at\)
-[ ]*RELOC: 0+0128 R_MIPS_LO16 .data
-0+012c <[^>]*> lw \$a1,5\(\$at\)
-[ ]*RELOC: 0+012c R_MIPS_LO16 .data
-0+0130 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0130 R_MIPS_GOT_HI16 big_external_data_label
-0+0134 <[^>]*> addu \$at,\$at,\$gp
-0+0138 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0138 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0140 <[^>]*> lw \$a0,1\(\$at\)
-0+0144 <[^>]*> lw \$a1,5\(\$at\)
-0+0148 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0148 R_MIPS_GOT_HI16 small_external_data_label
-0+014c <[^>]*> addu \$at,\$at,\$gp
-0+0150 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0150 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0158 <[^>]*> lw \$a0,1\(\$at\)
-0+015c <[^>]*> lw \$a1,5\(\$at\)
-0+0160 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0160 R_MIPS_GOT_HI16 big_external_common
-0+0164 <[^>]*> addu \$at,\$at,\$gp
-0+0168 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0168 R_MIPS_GOT_LO16 big_external_common
-...
-0+0170 <[^>]*> lw \$a0,1\(\$at\)
-0+0174 <[^>]*> lw \$a1,5\(\$at\)
-0+0178 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0178 R_MIPS_GOT_HI16 small_external_common
-0+017c <[^>]*> addu \$at,\$at,\$gp
-0+0180 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0180 R_MIPS_GOT_LO16 small_external_common
-...
-0+0188 <[^>]*> lw \$a0,1\(\$at\)
-0+018c <[^>]*> lw \$a1,5\(\$at\)
-0+0190 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0190 R_MIPS_GOT16 .bss
-...
-0+0198 <[^>]*> lw \$a0,1\(\$at\)
-[ ]*RELOC: 0+0198 R_MIPS_LO16 .bss
-0+019c <[^>]*> lw \$a1,5\(\$at\)
-[ ]*RELOC: 0+019c R_MIPS_LO16 .bss
-0+01a0 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+01a0 R_MIPS_GOT16 .bss
-...
-0+01a8 <[^>]*> lw \$a0,1001\(\$at\)
-[ ]*RELOC: 0+01a8 R_MIPS_LO16 .bss
-0+01ac <[^>]*> lw \$a1,1005\(\$at\)
-[ ]*RELOC: 0+01ac R_MIPS_LO16 .bss
-0+01b0 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+01b0 R_MIPS_GOT16 .data
-...
-0+01b8 <[^>]*> addu \$at,\$a1,\$at
-0+01bc <[^>]*> lw \$a0,0\(\$at\)
-[ ]*RELOC: 0+01bc R_MIPS_LO16 .data
-0+01c0 <[^>]*> lw \$a1,4\(\$at\)
-[ ]*RELOC: 0+01c0 R_MIPS_LO16 .data
-0+01c4 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+01c4 R_MIPS_GOT_HI16 big_external_data_label
-0+01c8 <[^>]*> addu \$at,\$at,\$gp
-0+01cc <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+01cc R_MIPS_GOT_LO16 big_external_data_label
-...
-0+01d4 <[^>]*> addu \$at,\$a1,\$at
-0+01d8 <[^>]*> lw \$a0,0\(\$at\)
-0+01dc <[^>]*> lw \$a1,4\(\$at\)
-0+01e0 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+01e0 R_MIPS_GOT_HI16 small_external_data_label
-0+01e4 <[^>]*> addu \$at,\$at,\$gp
-0+01e8 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+01e8 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+01f0 <[^>]*> addu \$at,\$a1,\$at
-0+01f4 <[^>]*> lw \$a0,0\(\$at\)
-0+01f8 <[^>]*> lw \$a1,4\(\$at\)
-0+01fc <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+01fc R_MIPS_GOT_HI16 big_external_common
-0+0200 <[^>]*> addu \$at,\$at,\$gp
-0+0204 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0204 R_MIPS_GOT_LO16 big_external_common
-...
-0+020c <[^>]*> addu \$at,\$a1,\$at
-0+0210 <[^>]*> lw \$a0,0\(\$at\)
-0+0214 <[^>]*> lw \$a1,4\(\$at\)
-0+0218 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0218 R_MIPS_GOT_HI16 small_external_common
-0+021c <[^>]*> addu \$at,\$at,\$gp
-0+0220 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0220 R_MIPS_GOT_LO16 small_external_common
-...
-0+0228 <[^>]*> addu \$at,\$a1,\$at
-0+022c <[^>]*> lw \$a0,0\(\$at\)
-0+0230 <[^>]*> lw \$a1,4\(\$at\)
-0+0234 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0234 R_MIPS_GOT16 .bss
-...
-0+023c <[^>]*> addu \$at,\$a1,\$at
-0+0240 <[^>]*> lw \$a0,0\(\$at\)
-[ ]*RELOC: 0+0240 R_MIPS_LO16 .bss
-0+0244 <[^>]*> lw \$a1,4\(\$at\)
-[ ]*RELOC: 0+0244 R_MIPS_LO16 .bss
-0+0248 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0248 R_MIPS_GOT16 .bss
-...
-0+0250 <[^>]*> addu \$at,\$a1,\$at
-0+0254 <[^>]*> lw \$a0,1000\(\$at\)
-[ ]*RELOC: 0+0254 R_MIPS_LO16 .bss
-0+0258 <[^>]*> lw \$a1,1004\(\$at\)
-[ ]*RELOC: 0+0258 R_MIPS_LO16 .bss
-0+025c <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+025c R_MIPS_GOT16 .data
-...
-0+0264 <[^>]*> addu \$at,\$a1,\$at
-0+0268 <[^>]*> lw \$a0,1\(\$at\)
-[ ]*RELOC: 0+0268 R_MIPS_LO16 .data
-0+026c <[^>]*> lw \$a1,5\(\$at\)
-[ ]*RELOC: 0+026c R_MIPS_LO16 .data
-0+0270 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0270 R_MIPS_GOT_HI16 big_external_data_label
-0+0274 <[^>]*> addu \$at,\$at,\$gp
-0+0278 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0278 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0280 <[^>]*> addu \$at,\$a1,\$at
-0+0284 <[^>]*> lw \$a0,1\(\$at\)
-0+0288 <[^>]*> lw \$a1,5\(\$at\)
-0+028c <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+028c R_MIPS_GOT_HI16 small_external_data_label
-0+0290 <[^>]*> addu \$at,\$at,\$gp
-0+0294 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0294 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+029c <[^>]*> addu \$at,\$a1,\$at
-0+02a0 <[^>]*> lw \$a0,1\(\$at\)
-0+02a4 <[^>]*> lw \$a1,5\(\$at\)
-0+02a8 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+02a8 R_MIPS_GOT_HI16 big_external_common
-0+02ac <[^>]*> addu \$at,\$at,\$gp
-0+02b0 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+02b0 R_MIPS_GOT_LO16 big_external_common
-...
-0+02b8 <[^>]*> addu \$at,\$a1,\$at
-0+02bc <[^>]*> lw \$a0,1\(\$at\)
-0+02c0 <[^>]*> lw \$a1,5\(\$at\)
-0+02c4 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+02c4 R_MIPS_GOT_HI16 small_external_common
-0+02c8 <[^>]*> addu \$at,\$at,\$gp
-0+02cc <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+02cc R_MIPS_GOT_LO16 small_external_common
-...
-0+02d4 <[^>]*> addu \$at,\$a1,\$at
-0+02d8 <[^>]*> lw \$a0,1\(\$at\)
-0+02dc <[^>]*> lw \$a1,5\(\$at\)
-0+02e0 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+02e0 R_MIPS_GOT16 .bss
-...
-0+02e8 <[^>]*> addu \$at,\$a1,\$at
-0+02ec <[^>]*> lw \$a0,1\(\$at\)
-[ ]*RELOC: 0+02ec R_MIPS_LO16 .bss
-0+02f0 <[^>]*> lw \$a1,5\(\$at\)
-[ ]*RELOC: 0+02f0 R_MIPS_LO16 .bss
-0+02f4 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+02f4 R_MIPS_GOT16 .bss
-...
-0+02fc <[^>]*> addu \$at,\$a1,\$at
-0+0300 <[^>]*> lw \$a0,1001\(\$at\)
-[ ]*RELOC: 0+0300 R_MIPS_LO16 .bss
-0+0304 <[^>]*> lw \$a1,1005\(\$at\)
-[ ]*RELOC: 0+0304 R_MIPS_LO16 .bss
-...
+0+0000 <[^>]*> lw \$a0,0\(\$zero\)
+0+0004 <[^>]*> lw \$a1,4\(\$zero\)
+0+0008 <[^>]*> lw \$a0,1\(\$zero\)
+0+000c <[^>]*> lw \$a1,5\(\$zero\)
+0+0010 <[^>]*> lui \$at,0x1
+0+0014 <[^>]*> lw \$a0,-32768\(\$at\)
+0+0018 <[^>]*> lw \$a1,-32764\(\$at\)
+0+001c <[^>]*> lw \$a0,-32768\(\$zero\)
+0+0020 <[^>]*> lw \$a1,-32764\(\$zero\)
+0+0024 <[^>]*> lui \$at,0x1
+0+0028 <[^>]*> lw \$a0,0\(\$at\)
+0+002c <[^>]*> lw \$a1,4\(\$at\)
+0+0030 <[^>]*> lui \$at,0x2
+0+0034 <[^>]*> lw \$a0,-23131\(\$at\)
+0+0038 <[^>]*> lw \$a1,-23127\(\$at\)
+0+003c <[^>]*> nop
+0+0040 <[^>]*> lw \$a0,0\(\$a1\)
+0+0044 <[^>]*> lw \$a1,4\(\$a1\)
+0+0048 <[^>]*> nop
+0+004c <[^>]*> lw \$a0,1\(\$a1\)
+0+0050 <[^>]*> lw \$a1,5\(\$a1\)
+0+0054 <[^>]*> lui \$at,0x1
+0+0058 <[^>]*> addu \$at,\$a1,\$at
+0+005c <[^>]*> lw \$a0,-32768\(\$at\)
+0+0060 <[^>]*> lw \$a1,-32764\(\$at\)
+0+0064 <[^>]*> nop
+0+0068 <[^>]*> lw \$a0,-32768\(\$a1\)
+0+006c <[^>]*> lw \$a1,-32764\(\$a1\)
+0+0070 <[^>]*> lui \$at,0x1
+0+0074 <[^>]*> addu \$at,\$a1,\$at
+0+0078 <[^>]*> lw \$a0,0\(\$at\)
+0+007c <[^>]*> lw \$a1,4\(\$at\)
+0+0080 <[^>]*> lui \$at,0x2
+0+0084 <[^>]*> addu \$at,\$a1,\$at
+0+0088 <[^>]*> lw \$a0,-23131\(\$at\)
+0+008c <[^>]*> lw \$a1,-23127\(\$at\)
+0+0090 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*90: R_MIPS_GOT16 .data
+0+0094 <[^>]*> nop
+0+0098 <[^>]*> lw \$a0,0\(\$at\)
+[ ]*98: R_MIPS_LO16 .data
+0+009c <[^>]*> lw \$a1,4\(\$at\)
+[ ]*9c: R_MIPS_LO16 .data
+0+00a0 <[^>]*> lui \$at,0x0
+[ ]*a0: R_MIPS_GOT_HI16 big_external_data_label
+0+00a4 <[^>]*> addu \$at,\$at,\$gp
+0+00a8 <[^>]*> lw \$at,0\(\$at\)
+[ ]*a8: R_MIPS_GOT_LO16 big_external_data_label
+0+00ac <[^>]*> nop
+0+00b0 <[^>]*> lw \$a0,0\(\$at\)
+0+00b4 <[^>]*> lw \$a1,4\(\$at\)
+0+00b8 <[^>]*> lui \$at,0x0
+[ ]*b8: R_MIPS_GOT_HI16 small_external_data_label
+0+00bc <[^>]*> addu \$at,\$at,\$gp
+0+00c0 <[^>]*> lw \$at,0\(\$at\)
+[ ]*c0: R_MIPS_GOT_LO16 small_external_data_label
+0+00c4 <[^>]*> nop
+0+00c8 <[^>]*> lw \$a0,0\(\$at\)
+0+00cc <[^>]*> lw \$a1,4\(\$at\)
+0+00d0 <[^>]*> lui \$at,0x0
+[ ]*d0: R_MIPS_GOT_HI16 big_external_common
+0+00d4 <[^>]*> addu \$at,\$at,\$gp
+0+00d8 <[^>]*> lw \$at,0\(\$at\)
+[ ]*d8: R_MIPS_GOT_LO16 big_external_common
+0+00dc <[^>]*> nop
+0+00e0 <[^>]*> lw \$a0,0\(\$at\)
+0+00e4 <[^>]*> lw \$a1,4\(\$at\)
+0+00e8 <[^>]*> lui \$at,0x0
+[ ]*e8: R_MIPS_GOT_HI16 small_external_common
+0+00ec <[^>]*> addu \$at,\$at,\$gp
+0+00f0 <[^>]*> lw \$at,0\(\$at\)
+[ ]*f0: R_MIPS_GOT_LO16 small_external_common
+0+00f4 <[^>]*> nop
+0+00f8 <[^>]*> lw \$a0,0\(\$at\)
+0+00fc <[^>]*> lw \$a1,4\(\$at\)
+0+0100 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*100: R_MIPS_GOT16 .bss
+0+0104 <[^>]*> nop
+0+0108 <[^>]*> lw \$a0,0\(\$at\)
+[ ]*108: R_MIPS_LO16 .bss
+0+010c <[^>]*> lw \$a1,4\(\$at\)
+[ ]*10c: R_MIPS_LO16 .bss
+0+0110 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*110: R_MIPS_GOT16 .bss
+0+0114 <[^>]*> nop
+0+0118 <[^>]*> lw \$a0,1000\(\$at\)
+[ ]*118: R_MIPS_LO16 .bss
+0+011c <[^>]*> lw \$a1,1004\(\$at\)
+[ ]*11c: R_MIPS_LO16 .bss
+0+0120 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*120: R_MIPS_GOT16 .data
+0+0124 <[^>]*> nop
+0+0128 <[^>]*> lw \$a0,1\(\$at\)
+[ ]*128: R_MIPS_LO16 .data
+0+012c <[^>]*> lw \$a1,5\(\$at\)
+[ ]*12c: R_MIPS_LO16 .data
+0+0130 <[^>]*> lui \$at,0x0
+[ ]*130: R_MIPS_GOT_HI16 big_external_data_label
+0+0134 <[^>]*> addu \$at,\$at,\$gp
+0+0138 <[^>]*> lw \$at,0\(\$at\)
+[ ]*138: R_MIPS_GOT_LO16 big_external_data_label
+0+013c <[^>]*> nop
+0+0140 <[^>]*> lw \$a0,1\(\$at\)
+0+0144 <[^>]*> lw \$a1,5\(\$at\)
+0+0148 <[^>]*> lui \$at,0x0
+[ ]*148: R_MIPS_GOT_HI16 small_external_data_label
+0+014c <[^>]*> addu \$at,\$at,\$gp
+0+0150 <[^>]*> lw \$at,0\(\$at\)
+[ ]*150: R_MIPS_GOT_LO16 small_external_data_label
+0+0154 <[^>]*> nop
+0+0158 <[^>]*> lw \$a0,1\(\$at\)
+0+015c <[^>]*> lw \$a1,5\(\$at\)
+0+0160 <[^>]*> lui \$at,0x0
+[ ]*160: R_MIPS_GOT_HI16 big_external_common
+0+0164 <[^>]*> addu \$at,\$at,\$gp
+0+0168 <[^>]*> lw \$at,0\(\$at\)
+[ ]*168: R_MIPS_GOT_LO16 big_external_common
+0+016c <[^>]*> nop
+0+0170 <[^>]*> lw \$a0,1\(\$at\)
+0+0174 <[^>]*> lw \$a1,5\(\$at\)
+0+0178 <[^>]*> lui \$at,0x0
+[ ]*178: R_MIPS_GOT_HI16 small_external_common
+0+017c <[^>]*> addu \$at,\$at,\$gp
+0+0180 <[^>]*> lw \$at,0\(\$at\)
+[ ]*180: R_MIPS_GOT_LO16 small_external_common
+0+0184 <[^>]*> nop
+0+0188 <[^>]*> lw \$a0,1\(\$at\)
+0+018c <[^>]*> lw \$a1,5\(\$at\)
+0+0190 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*190: R_MIPS_GOT16 .bss
+0+0194 <[^>]*> nop
+0+0198 <[^>]*> lw \$a0,1\(\$at\)
+[ ]*198: R_MIPS_LO16 .bss
+0+019c <[^>]*> lw \$a1,5\(\$at\)
+[ ]*19c: R_MIPS_LO16 .bss
+0+01a0 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*1a0: R_MIPS_GOT16 .bss
+0+01a4 <[^>]*> nop
+0+01a8 <[^>]*> lw \$a0,1001\(\$at\)
+[ ]*1a8: R_MIPS_LO16 .bss
+0+01ac <[^>]*> lw \$a1,1005\(\$at\)
+[ ]*1ac: R_MIPS_LO16 .bss
+0+01b0 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*1b0: R_MIPS_GOT16 .data
+0+01b4 <[^>]*> nop
+0+01b8 <[^>]*> addu \$at,\$a1,\$at
+0+01bc <[^>]*> lw \$a0,0\(\$at\)
+[ ]*1bc: R_MIPS_LO16 .data
+0+01c0 <[^>]*> lw \$a1,4\(\$at\)
+[ ]*1c0: R_MIPS_LO16 .data
+0+01c4 <[^>]*> lui \$at,0x0
+[ ]*1c4: R_MIPS_GOT_HI16 big_external_data_label
+0+01c8 <[^>]*> addu \$at,\$at,\$gp
+0+01cc <[^>]*> lw \$at,0\(\$at\)
+[ ]*1cc: R_MIPS_GOT_LO16 big_external_data_label
+0+01d0 <[^>]*> nop
+0+01d4 <[^>]*> addu \$at,\$a1,\$at
+0+01d8 <[^>]*> lw \$a0,0\(\$at\)
+0+01dc <[^>]*> lw \$a1,4\(\$at\)
+0+01e0 <[^>]*> lui \$at,0x0
+[ ]*1e0: R_MIPS_GOT_HI16 small_external_data_label
+0+01e4 <[^>]*> addu \$at,\$at,\$gp
+0+01e8 <[^>]*> lw \$at,0\(\$at\)
+[ ]*1e8: R_MIPS_GOT_LO16 small_external_data_label
+0+01ec <[^>]*> nop
+0+01f0 <[^>]*> addu \$at,\$a1,\$at
+0+01f4 <[^>]*> lw \$a0,0\(\$at\)
+0+01f8 <[^>]*> lw \$a1,4\(\$at\)
+0+01fc <[^>]*> lui \$at,0x0
+[ ]*1fc: R_MIPS_GOT_HI16 big_external_common
+0+0200 <[^>]*> addu \$at,\$at,\$gp
+0+0204 <[^>]*> lw \$at,0\(\$at\)
+[ ]*204: R_MIPS_GOT_LO16 big_external_common
+0+0208 <[^>]*> nop
+0+020c <[^>]*> addu \$at,\$a1,\$at
+0+0210 <[^>]*> lw \$a0,0\(\$at\)
+0+0214 <[^>]*> lw \$a1,4\(\$at\)
+0+0218 <[^>]*> lui \$at,0x0
+[ ]*218: R_MIPS_GOT_HI16 small_external_common
+0+021c <[^>]*> addu \$at,\$at,\$gp
+0+0220 <[^>]*> lw \$at,0\(\$at\)
+[ ]*220: R_MIPS_GOT_LO16 small_external_common
+0+0224 <[^>]*> nop
+0+0228 <[^>]*> addu \$at,\$a1,\$at
+0+022c <[^>]*> lw \$a0,0\(\$at\)
+0+0230 <[^>]*> lw \$a1,4\(\$at\)
+0+0234 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*234: R_MIPS_GOT16 .bss
+0+0238 <[^>]*> nop
+0+023c <[^>]*> addu \$at,\$a1,\$at
+0+0240 <[^>]*> lw \$a0,0\(\$at\)
+[ ]*240: R_MIPS_LO16 .bss
+0+0244 <[^>]*> lw \$a1,4\(\$at\)
+[ ]*244: R_MIPS_LO16 .bss
+0+0248 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*248: R_MIPS_GOT16 .bss
+0+024c <[^>]*> nop
+0+0250 <[^>]*> addu \$at,\$a1,\$at
+0+0254 <[^>]*> lw \$a0,1000\(\$at\)
+[ ]*254: R_MIPS_LO16 .bss
+0+0258 <[^>]*> lw \$a1,1004\(\$at\)
+[ ]*258: R_MIPS_LO16 .bss
+0+025c <[^>]*> lw \$at,0\(\$gp\)
+[ ]*25c: R_MIPS_GOT16 .data
+0+0260 <[^>]*> nop
+0+0264 <[^>]*> addu \$at,\$a1,\$at
+0+0268 <[^>]*> lw \$a0,1\(\$at\)
+[ ]*268: R_MIPS_LO16 .data
+0+026c <[^>]*> lw \$a1,5\(\$at\)
+[ ]*26c: R_MIPS_LO16 .data
+0+0270 <[^>]*> lui \$at,0x0
+[ ]*270: R_MIPS_GOT_HI16 big_external_data_label
+0+0274 <[^>]*> addu \$at,\$at,\$gp
+0+0278 <[^>]*> lw \$at,0\(\$at\)
+[ ]*278: R_MIPS_GOT_LO16 big_external_data_label
+0+027c <[^>]*> nop
+0+0280 <[^>]*> addu \$at,\$a1,\$at
+0+0284 <[^>]*> lw \$a0,1\(\$at\)
+0+0288 <[^>]*> lw \$a1,5\(\$at\)
+0+028c <[^>]*> lui \$at,0x0
+[ ]*28c: R_MIPS_GOT_HI16 small_external_data_label
+0+0290 <[^>]*> addu \$at,\$at,\$gp
+0+0294 <[^>]*> lw \$at,0\(\$at\)
+[ ]*294: R_MIPS_GOT_LO16 small_external_data_label
+0+0298 <[^>]*> nop
+0+029c <[^>]*> addu \$at,\$a1,\$at
+0+02a0 <[^>]*> lw \$a0,1\(\$at\)
+0+02a4 <[^>]*> lw \$a1,5\(\$at\)
+0+02a8 <[^>]*> lui \$at,0x0
+[ ]*2a8: R_MIPS_GOT_HI16 big_external_common
+0+02ac <[^>]*> addu \$at,\$at,\$gp
+0+02b0 <[^>]*> lw \$at,0\(\$at\)
+[ ]*2b0: R_MIPS_GOT_LO16 big_external_common
+0+02b4 <[^>]*> nop
+0+02b8 <[^>]*> addu \$at,\$a1,\$at
+0+02bc <[^>]*> lw \$a0,1\(\$at\)
+0+02c0 <[^>]*> lw \$a1,5\(\$at\)
+0+02c4 <[^>]*> lui \$at,0x0
+[ ]*2c4: R_MIPS_GOT_HI16 small_external_common
+0+02c8 <[^>]*> addu \$at,\$at,\$gp
+0+02cc <[^>]*> lw \$at,0\(\$at\)
+[ ]*2cc: R_MIPS_GOT_LO16 small_external_common
+0+02d0 <[^>]*> nop
+0+02d4 <[^>]*> addu \$at,\$a1,\$at
+0+02d8 <[^>]*> lw \$a0,1\(\$at\)
+0+02dc <[^>]*> lw \$a1,5\(\$at\)
+0+02e0 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*2e0: R_MIPS_GOT16 .bss
+0+02e4 <[^>]*> nop
+0+02e8 <[^>]*> addu \$at,\$a1,\$at
+0+02ec <[^>]*> lw \$a0,1\(\$at\)
+[ ]*2ec: R_MIPS_LO16 .bss
+0+02f0 <[^>]*> lw \$a1,5\(\$at\)
+[ ]*2f0: R_MIPS_LO16 .bss
+0+02f4 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*2f4: R_MIPS_GOT16 .bss
+0+02f8 <[^>]*> nop
+0+02fc <[^>]*> addu \$at,\$a1,\$at
+0+0300 <[^>]*> lw \$a0,1001\(\$at\)
+[ ]*300: R_MIPS_LO16 .bss
+0+0304 <[^>]*> lw \$a1,1005\(\$at\)
+[ ]*304: R_MIPS_LO16 .bss
+ ...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/li.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/li.s
index 724f5510e73..7a3848ca4ad 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/li.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/li.s
@@ -1,5 +1,6 @@
# Source file used to test the li macro.
-
+
+foo:
li $4,0
li $4,1
li $4,0x8000
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lif-xgot.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lif-xgot.d
index 156a58e22d4..1c2f8e5d779 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lif-xgot.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/lif-xgot.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS lifloat-xgot
#as: -mips1 -KPIC -xgot
#source: lifloat.s
@@ -8,21 +8,21 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0000 R_MIPS_GOT16 .rodata
-...
-0+0008 <[^>]*> lw \$a0,0\(\$at\)
-[ ]*RELOC: 0+0008 R_MIPS_LO16 .rodata
-0+000c <[^>]*> lw \$a1,4\(\$at\)
-[ ]*RELOC: 0+000c R_MIPS_LO16 .rodata
-0+0010 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0010 R_MIPS_GOT16 .rodata
-...
-0+0018 <[^>]*> lwc1 \$f5,8\(\$at\)
-[ ]*RELOC: 0+0018 R_MIPS_LO16 .rodata
-0+001c <[^>]*> lwc1 \$f4,12\(\$at\)
-[ ]*RELOC: 0+001c R_MIPS_LO16 .rodata
-0+0020 <[^>]*> lui \$a0,0x3f80
-0+0024 <[^>]*> lui \$at,0x3f80
-0+0028 <[^>]*> mtc1 \$at,\$f4
-...
+0+0000 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*0: R_MIPS_GOT16 .rodata
+0+0004 <[^>]*> nop
+0+0008 <[^>]*> lw \$a0,0\(\$at\)
+[ ]*8: R_MIPS_LO16 .rodata
+0+000c <[^>]*> lw \$a1,4\(\$at\)
+[ ]*c: R_MIPS_LO16 .rodata
+0+0010 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*10: R_MIPS_GOT16 .rodata
+0+0014 <[^>]*> nop
+0+0018 <[^>]*> lwc1 \$f5,8\(\$at\)
+[ ]*18: R_MIPS_LO16 .rodata
+0+001c <[^>]*> lwc1 \$f4,12\(\$at\)
+[ ]*1c: R_MIPS_LO16 .rodata
+0+0020 <[^>]*> lui \$a0,0x3f80
+0+0024 <[^>]*> lui \$at,0x3f80
+0+0028 <[^>]*> mtc1 \$at,\$f4
+0+002c <[^>]*> nop
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.d
index f4ed8e89c8a..0a427d6ea15 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS mips4
#as: -mips4
@@ -7,45 +7,45 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> bc1f 00000000+ <text_label>
-...
-0+0008 <[^>]*> bc1f 1,00000000+ <text_label>
-...
-0+0010 <[^>]*> bc1fl 1,00000000+ <text_label>
-...
-0+0018 <[^>]*> bc1t 1,00000000+ <text_label>
-...
-0+0020 <[^>]*> bc1tl 2,00000000+ <text_label>
-...
-0+0028 <[^>]*> c.f.d \$f4,\$f6
-0+002c <[^>]*> c.f.d 1,\$f4,\$f6
-0+0030 <[^>]*> ldxc1 \$f2,\$a0\(\$a1\)
-0+0034 <[^>]*> lwxc1 \$f2,\$a0\(\$a1\)
-0+0038 <[^>]*> madd.d \$f0,\$f2,\$f4,\$f6
-0+003c <[^>]*> madd.s \$f0,\$f2,\$f4,\$f6
-0+0040 <[^>]*> movf \$a0,\$a1,4
-0+0044 <[^>]*> movf.d \$f4,\$f6,0
-0+0048 <[^>]*> movf.s \$f4,\$f6,0
-0+004c <[^>]*> movn \$a0,\$a2,\$a2
-0+0050 <[^>]*> movn.d \$f4,\$f5,\$a2
-0+0054 <[^>]*> movn.s \$f4,\$f5,\$a2
-0+0058 <[^>]*> movt \$a0,\$a1,4
-0+005c <[^>]*> movt.d \$f4,\$f6,0
-0+0060 <[^>]*> movt.s \$f4,\$f6,0
-0+0064 <[^>]*> movz \$a0,\$a2,\$a2
-0+0068 <[^>]*> movz.d \$f4,\$f5,\$a2
-0+006c <[^>]*> movz.s \$f4,\$f5,\$a2
-0+0070 <[^>]*> msub.d \$f0,\$f2,\$f4,\$f6
-0+0074 <[^>]*> msub.s \$f0,\$f2,\$f4,\$f6
-0+0078 <[^>]*> nmadd.d \$f0,\$f2,\$f4,\$f6
-0+007c <[^>]*> nmadd.s \$f0,\$f2,\$f4,\$f6
-0+0080 <[^>]*> nmsub.d \$f0,\$f2,\$f4,\$f6
-0+0084 <[^>]*> nmsub.s \$f0,\$f2,\$f4,\$f6
-0+0088 <[^>]*> prefx 0x4,\$a0\(\$a1\)
-0+008c <[^>]*> recip.d \$f4,\$f6
-0+0090 <[^>]*> recip.s \$f4,\$f6
-0+0094 <[^>]*> rsqrt.d \$f4,\$f6
-0+0098 <[^>]*> rsqrt.s \$f4,\$f6
-0+009c <[^>]*> sdxc1 \$f4,\$a0\(\$a1\)
-0+00a0 <[^>]*> swxc1 \$f4,\$a0\(\$a1\)
-...
+0+0000 <[^>]*> bc1f 00000000+ <text_label>
+0+0004 <[^>]*> nop
+0+0008 <[^>]*> bc1f \$fcc1,00000000+ <text_label>
+0+000c <[^>]*> nop
+0+0010 <[^>]*> bc1fl \$fcc1,00000000+ <text_label>
+0+0014 <[^>]*> nop
+0+0018 <[^>]*> bc1t \$fcc1,00000000+ <text_label>
+0+001c <[^>]*> nop
+0+0020 <[^>]*> bc1tl \$fcc2,00000000+ <text_label>
+0+0024 <[^>]*> nop
+0+0028 <[^>]*> c.f.d \$f4,\$f6
+0+002c <[^>]*> c.f.d \$fcc1,\$f4,\$f6
+0+0030 <[^>]*> ldxc1 \$f2,\$a0\(\$a1\)
+0+0034 <[^>]*> lwxc1 \$f2,\$a0\(\$a1\)
+0+0038 <[^>]*> madd.d \$f0,\$f2,\$f4,\$f6
+0+003c <[^>]*> madd.s \$f0,\$f2,\$f4,\$f6
+0+0040 <[^>]*> movf \$a0,\$a1,\$fcc4
+0+0044 <[^>]*> movf.d \$f4,\$f6,\$fcc0
+0+0048 <[^>]*> movf.s \$f4,\$f6,\$fcc0
+0+004c <[^>]*> movn \$a0,\$a2,\$a2
+0+0050 <[^>]*> movn.d \$f4,\$f5,\$a2
+0+0054 <[^>]*> movn.s \$f4,\$f5,\$a2
+0+0058 <[^>]*> movt \$a0,\$a1,\$fcc4
+0+005c <[^>]*> movt.d \$f4,\$f6,\$fcc0
+0+0060 <[^>]*> movt.s \$f4,\$f6,\$fcc0
+0+0064 <[^>]*> movz \$a0,\$a2,\$a2
+0+0068 <[^>]*> movz.d \$f4,\$f5,\$a2
+0+006c <[^>]*> movz.s \$f4,\$f5,\$a2
+0+0070 <[^>]*> msub.d \$f0,\$f2,\$f4,\$f6
+0+0074 <[^>]*> msub.s \$f0,\$f2,\$f4,\$f6
+0+0078 <[^>]*> nmadd.d \$f0,\$f2,\$f4,\$f6
+0+007c <[^>]*> nmadd.s \$f0,\$f2,\$f4,\$f6
+0+0080 <[^>]*> nmsub.d \$f0,\$f2,\$f4,\$f6
+0+0084 <[^>]*> nmsub.s \$f0,\$f2,\$f4,\$f6
+0+0088 <[^>]*> prefx 0x4,\$a0\(\$a1\)
+0+008c <[^>]*> recip.d \$f4,\$f6
+0+0090 <[^>]*> recip.s \$f4,\$f6
+0+0094 <[^>]*> rsqrt.d \$f4,\$f6
+0+0098 <[^>]*> rsqrt.s \$f4,\$f6
+0+009c <[^>]*> sdxc1 \$f4,\$a0\(\$a1\)
+0+00a0 <[^>]*> swxc1 \$f4,\$a0\(\$a1\)
+ ...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.s
index b4d64f71c79..7b7b634f973 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mips4.s
@@ -2,25 +2,25 @@
text_label:
bc1f text_label
- bc1f 1,text_label
- bc1fl 1,text_label
- bc1t 1,text_label
- bc1tl 2,text_label
+ bc1f $fcc1,text_label
+ bc1fl $fcc1,text_label
+ bc1t $fcc1,text_label
+ bc1tl $fcc2,text_label
c.f.d $f4,$f6
- c.f.d 1,$f4,$f6
+ c.f.d $fcc1,$f4,$f6
ldxc1 $f2,$4($5)
lwxc1 $f2,$4($5)
madd.d $f0,$f2,$f4,$f6
madd.s $f0,$f2,$f4,$f6
- movf $4,$5,4
- movf.d $f4,$f6,0
- movf.s $f4,$f6,0
+ movf $4,$5,$fcc4
+ movf.d $f4,$f6,$fcc0
+ movf.s $f4,$f6,$fcc0
movn $4,$6,$6
movn.d $f4,$f5,$6
movn.s $f4,$f5,$6
- movt $4,$5,4
- movt.d $f4,$f6,0
- movt.s $f4,$f6,0
+ movt $4,$5,$fcc4
+ movt.d $f4,$f6,$fcc0
+ movt.s $f4,$f6,$fcc0
movz $4,$6,$6
movz.d $f4,$f5,$6
movz.s $f4,$f5,$6
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul-ilocks.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul-ilocks.d
index 257e2ad4c64..9a3f279d9c0 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul-ilocks.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul-ilocks.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS mul
#source: mul.s
@@ -6,76 +6,75 @@
.*: +file format .*mips.*
-No symbols in .*
Disassembly of section .text:
-0+0000 multu \$a0,\$a1
-0+0004 mflo \$a0
-0+0008 multu \$a1,\$a2
-0+000c mflo \$a0
-0+0010 li \$at,0
-0+0014 mult \$a1,\$at
-0+0018 mflo \$a0
-0+001c li \$at,1
-0+0020 mult \$a1,\$at
-0+0024 mflo \$a0
-0+0028 li \$at,0x8000
-0+002c mult \$a1,\$at
-0+0030 mflo \$a0
-0+0034 li \$at,-32768
-0+0038 mult \$a1,\$at
-0+003c mflo \$a0
-0+0040 lui \$at,0x1
-0+0044 mult \$a1,\$at
-0+0048 mflo \$a0
-0+004c lui \$at,0x1
-0+0050 ori \$at,\$at,0xa5a5
-0+0054 mult \$a1,\$at
-0+0058 mflo \$a0
-0+005c mult \$a0,\$a1
-0+0060 mflo \$a0
-0+0064 sra \$a0,\$a0,0x1f
-0+0068 mfhi \$at
-0+006c beq \$a0,\$at,0+78
+0+0000 multu \$a0,\$a1
+0+0004 mflo \$a0
+0+0008 multu \$a1,\$a2
+0+000c mflo \$a0
+0+0010 li \$at,0
+0+0014 mult \$a1,\$at
+0+0018 mflo \$a0
+0+001c li \$at,1
+0+0020 mult \$a1,\$at
+0+0024 mflo \$a0
+0+0028 li \$at,0x8000
+0+002c mult \$a1,\$at
+0+0030 mflo \$a0
+0+0034 li \$at,-32768
+0+0038 mult \$a1,\$at
+0+003c mflo \$a0
+0+0040 lui \$at,0x1
+0+0044 mult \$a1,\$at
+0+0048 mflo \$a0
+0+004c lui \$at,0x1
+0+0050 ori \$at,\$at,0xa5a5
+0+0054 mult \$a1,\$at
+0+0058 mflo \$a0
+0+005c mult \$a0,\$a1
+0+0060 mflo \$a0
+0+0064 sra \$a0,\$a0,0x1f
+0+0068 mfhi \$at
+0+006c beq \$a0,\$at,0+78
...
-0+0074 break 0x6
-0+0078 mflo \$a0
-0+007c mult \$a1,\$a2
-0+0080 mflo \$a0
-0+0084 sra \$a0,\$a0,0x1f
-0+0088 mfhi \$at
-0+008c beq \$a0,\$at,0+98
+0+0074 break 0x6
+0+0078 mflo \$a0
+0+007c mult \$a1,\$a2
+0+0080 mflo \$a0
+0+0084 sra \$a0,\$a0,0x1f
+0+0088 mfhi \$at
+0+008c beq \$a0,\$at,0+98
...
-0+0094 break 0x6
-0+0098 mflo \$a0
-0+009c multu \$a0,\$a1
-0+00a0 mfhi \$at
-0+00a4 mflo \$a0
-0+00a8 beqz \$at,0+b4
+0+0094 break 0x6
+0+0098 mflo \$a0
+0+009c multu \$a0,\$a1
+0+00a0 mfhi \$at
+0+00a4 mflo \$a0
+0+00a8 beqz \$at,0+b4
...
-0+00b0 break 0x6
-0+00b4 multu \$a1,\$a2
-0+00b8 mfhi \$at
-0+00bc mflo \$a0
-0+00c0 beqz \$at,0+cc
+0+00b0 break 0x6
+0+00b4 multu \$a1,\$a2
+0+00b8 mfhi \$at
+0+00bc mflo \$a0
+0+00c0 beqz \$at,0+cc
...
-0+00c8 break 0x6
-0+00cc dmultu \$a1,\$a2
-0+00d0 mflo \$a0
-0+00d4 li \$at,1
-0+00d8 dmult \$a1,\$at
-0+00dc mflo \$a0
-0+00e0 dmult \$a1,\$a2
-0+00e4 mflo \$a0
-0+00e8 dsra32 \$a0,\$a0,0x1f
-0+00ec mfhi \$at
-0+00f0 beq \$a0,\$at,0+fc
+0+00c8 break 0x6
+0+00cc dmultu \$a1,\$a2
+0+00d0 mflo \$a0
+0+00d4 li \$at,1
+0+00d8 dmult \$a1,\$at
+0+00dc mflo \$a0
+0+00e0 dmult \$a1,\$a2
+0+00e4 mflo \$a0
+0+00e8 dsra32 \$a0,\$a0,0x1f
+0+00ec mfhi \$at
+0+00f0 beq \$a0,\$at,0+fc
...
-0+00f8 break 0x6
-0+00fc mflo \$a0
-0+0100 dmultu \$a1,\$a2
-0+0104 mfhi \$at
-0+0108 mflo \$a0
-0+010c beqz \$at,0+118
+0+00f8 break 0x6
+0+00fc mflo \$a0
+0+0100 dmultu \$a1,\$a2
+0+0104 mfhi \$at
+0+0108 mflo \$a0
+0+010c beqz \$at,0+118
...
-0+0114 break 0x6
+0+0114 break 0x6
...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul.s
index f9c20273b21..36173ff3f5d 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/mul.s
@@ -1,5 +1,6 @@
# Source file used to test the mul macro.
+foo:
mul $4,$5
mul $4,$5,$6
mul $4,$5,0
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.d
index b87d4bb2287..89becbff0fa 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.d
@@ -1,37 +1,36 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS rol
# Test the rol and ror macros.
.*: +file format .*mips.*
-No symbols in .*
Disassembly of section .text:
-0+0000 negu \$at,\$a1
-0+0004 srlv \$at,\$a0,\$at
-0+0008 sllv \$a0,\$a0,\$a1
-0+000c or \$a0,\$a0,\$at
-0+0010 negu \$at,\$a2
-0+0014 srlv \$at,\$a1,\$at
-0+0018 sllv \$a0,\$a1,\$a2
-0+001c or \$a0,\$a0,\$at
-0+0020 sll \$at,\$a0,0x1
-0+0024 srl \$a0,\$a0,0x1f
-0+0028 or \$a0,\$a0,\$at
-0+002c sll \$at,\$a1,0x1
-0+0030 srl \$a0,\$a1,0x1f
-0+0034 or \$a0,\$a0,\$at
-0+0038 negu \$at,\$a1
-0+003c sllv \$at,\$a0,\$at
-0+0040 srlv \$a0,\$a0,\$a1
-0+0044 or \$a0,\$a0,\$at
-0+0048 negu \$at,\$a2
-0+004c sllv \$at,\$a1,\$at
-0+0050 srlv \$a0,\$a1,\$a2
-0+0054 or \$a0,\$a0,\$at
-0+0058 srl \$at,\$a0,0x1
-0+005c sll \$a0,\$a0,0x1f
-0+0060 or \$a0,\$a0,\$at
-0+0064 srl \$at,\$a1,0x1
-0+0068 sll \$a0,\$a1,0x1f
-0+006c or \$a0,\$a0,\$at
+0+0000 <[^>]*> negu \$at,\$a1
+0+0004 <[^>]*> srlv \$at,\$a0,\$at
+0+0008 <[^>]*> sllv \$a0,\$a0,\$a1
+0+000c <[^>]*> or \$a0,\$a0,\$at
+0+0010 <[^>]*> negu \$at,\$a2
+0+0014 <[^>]*> srlv \$at,\$a1,\$at
+0+0018 <[^>]*> sllv \$a0,\$a1,\$a2
+0+001c <[^>]*> or \$a0,\$a0,\$at
+0+0020 <[^>]*> sll \$at,\$a0,0x1
+0+0024 <[^>]*> srl \$a0,\$a0,0x1f
+0+0028 <[^>]*> or \$a0,\$a0,\$at
+0+002c <[^>]*> sll \$at,\$a1,0x1
+0+0030 <[^>]*> srl \$a0,\$a1,0x1f
+0+0034 <[^>]*> or \$a0,\$a0,\$at
+0+0038 <[^>]*> negu \$at,\$a1
+0+003c <[^>]*> sllv \$at,\$a0,\$at
+0+0040 <[^>]*> srlv \$a0,\$a0,\$a1
+0+0044 <[^>]*> or \$a0,\$a0,\$at
+0+0048 <[^>]*> negu \$at,\$a2
+0+004c <[^>]*> sllv \$at,\$a1,\$at
+0+0050 <[^>]*> srlv \$a0,\$a1,\$a2
+0+0054 <[^>]*> or \$a0,\$a0,\$at
+0+0058 <[^>]*> srl \$at,\$a0,0x1
+0+005c <[^>]*> sll \$a0,\$a0,0x1f
+0+0060 <[^>]*> or \$a0,\$a0,\$at
+0+0064 <[^>]*> srl \$at,\$a1,0x1
+0+0068 <[^>]*> sll \$a0,\$a1,0x1f
+0+006c <[^>]*> or \$a0,\$a0,\$at
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.s
index cfed5ea448c..259a957e803 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/rol.s
@@ -1,5 +1,6 @@
# Source file used to test the rol and ror macros.
-
+
+foo:
rol $4,$5
rol $4,$5,$6
rol $4,1
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/trunc.s b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/trunc.s
index 31409ab10d4..e1e90f1e316 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/trunc.s
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/trunc.s
@@ -1,5 +1,6 @@
# Source file used to test the trunc macros.
+foo:
trunc.w.d $f4,$f6,$4
trunc.w.s $f4,$f6,$4
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-empic.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-empic.d
index ee236df6057..0a371b30cf4 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-empic.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-empic.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS ulh-empic
#as: -mips1 -membedded-pic
#source: ulh-pic.s
@@ -8,84 +8,84 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> addiu \$at,\$gp,-16384
-[ ]*RELOC: 0+0000 [A-Z0-9_]*GPREL[A-Z0-9_]* .sdata.*
-0+0004 <[^>]*> lb \$a0,[01]\(\$at\)
-0+0008 <[^>]*> lbu \$at,[01]\(\$at\)
-0+000c <[^>]*> sll \$a0,\$a0,0x8
-0+0010 <[^>]*> or \$a0,\$a0,\$at
-0+0014 <[^>]*> addiu \$at,\$gp,0
-[ ]*RELOC: 0+0014 [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_data_label
-0+0018 <[^>]*> lbu \$a0,[01]\(\$at\)
-0+001c <[^>]*> lbu \$at,[01]\(\$at\)
-0+0020 <[^>]*> sll \$a0,\$a0,0x8
-0+0024 <[^>]*> or \$a0,\$a0,\$at
-0+0028 <[^>]*> addiu \$at,\$gp,0
-[ ]*RELOC: 0+0028 [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_data_label
-0+002c <[^>]*> lwl \$a0,[03]\(\$at\)
-0+0030 <[^>]*> lwr \$a0,[03]\(\$at\)
-0+0034 <[^>]*> addiu \$at,\$gp,0
-[ ]*RELOC: 0+0034 [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_common
-0+0038 <[^>]*> sb \$a0,[01]\(\$at\)
-0+003c <[^>]*> srl \$a0,\$a0,0x8
-0+0040 <[^>]*> sb \$a0,[01]\(\$at\)
-0+0044 <[^>]*> lbu \$at,[01]\(\$at\)
-0+0048 <[^>]*> sll \$a0,\$a0,0x8
-0+004c <[^>]*> or \$a0,\$a0,\$at
-0+0050 <[^>]*> addiu \$at,\$gp,0
-[ ]*RELOC: 0+0050 [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_common
-0+0054 <[^>]*> swl \$a0,[03]\(\$at\)
-0+0058 <[^>]*> swr \$a0,[03]\(\$at\)
-0+005c <[^>]*> addiu \$at,\$gp,-16384
-[ ]*RELOC: 0+005c [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
-0+0060 <[^>]*> lb \$a0,[01]\(\$at\)
-0+0064 <[^>]*> lbu \$at,[01]\(\$at\)
-0+0068 <[^>]*> sll \$a0,\$a0,0x8
-0+006c <[^>]*> or \$a0,\$a0,\$at
-0+0070 <[^>]*> addiu \$at,\$gp,-15384
-[ ]*RELOC: 0+0070 [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
-0+0074 <[^>]*> lbu \$a0,[01]\(\$at\)
-0+0078 <[^>]*> lbu \$at,[01]\(\$at\)
-0+007c <[^>]*> sll \$a0,\$a0,0x8
-0+0080 <[^>]*> or \$a0,\$a0,\$at
-0+0084 <[^>]*> addiu \$at,\$gp,-16383
-[ ]*RELOC: 0+0084 [A-Z0-9_]*GPREL[A-Z0-9_]* .sdata.*
-0+0088 <[^>]*> lwl \$a0,[03]\(\$at\)
-0+008c <[^>]*> lwr \$a0,[03]\(\$at\)
-0+0090 <[^>]*> addiu \$at,\$gp,1
-[ ]*RELOC: 0+0090 [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_data_label
-0+0094 <[^>]*> sb \$a0,[01]\(\$at\)
-0+0098 <[^>]*> srl \$a0,\$a0,0x8
-0+009c <[^>]*> sb \$a0,[01]\(\$at\)
-0+00a0 <[^>]*> lbu \$at,[01]\(\$at\)
-0+00a4 <[^>]*> sll \$a0,\$a0,0x8
-0+00a8 <[^>]*> or \$a0,\$a0,\$at
-0+00ac <[^>]*> addiu \$at,\$gp,1
-[ ]*RELOC: 0+00ac [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_data_label
-0+00b0 <[^>]*> swl \$a0,[03]\(\$at\)
-0+00b4 <[^>]*> swr \$a0,[03]\(\$at\)
-0+00b8 <[^>]*> addiu \$at,\$gp,1
-[ ]*RELOC: 0+00b8 [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_common
-0+00bc <[^>]*> lb \$a0,[01]\(\$at\)
-0+00c0 <[^>]*> lbu \$at,[01]\(\$at\)
-0+00c4 <[^>]*> sll \$a0,\$a0,0x8
-0+00c8 <[^>]*> or \$a0,\$a0,\$at
-0+00cc <[^>]*> addiu \$at,\$gp,1
-[ ]*RELOC: 0+00cc [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_common
-0+00d0 <[^>]*> lbu \$a0,[01]\(\$at\)
-0+00d4 <[^>]*> lbu \$at,[01]\(\$at\)
-0+00d8 <[^>]*> sll \$a0,\$a0,0x8
-0+00dc <[^>]*> or \$a0,\$a0,\$at
-0+00e0 <[^>]*> addiu \$at,\$gp,-16383
-[ ]*RELOC: 0+00e0 [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
-0+00e4 <[^>]*> lwl \$a0,[03]\(\$at\)
-0+00e8 <[^>]*> lwr \$a0,[03]\(\$at\)
-0+00ec <[^>]*> addiu \$at,\$gp,-15383
-[ ]*RELOC: 0+00ec [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
-0+00f0 <[^>]*> sb \$a0,[01]\(\$at\)
-0+00f4 <[^>]*> srl \$a0,\$a0,0x8
-0+00f8 <[^>]*> sb \$a0,[01]\(\$at\)
-0+00fc <[^>]*> lbu \$at,[01]\(\$at\)
-0+0100 <[^>]*> sll \$a0,\$a0,0x8
-0+0104 <[^>]*> or \$a0,\$a0,\$at
-...
+0+0000 <[^>]*> addiu \$at,\$gp,-16384
+[ ]*0: [A-Z0-9_]*GPREL[A-Z0-9_]* .sdata.*
+0+0004 <[^>]*> lb \$a0,[01]\(\$at\)
+0+0008 <[^>]*> lbu \$at,[01]\(\$at\)
+0+000c <[^>]*> sll \$a0,\$a0,0x8
+0+0010 <[^>]*> or \$a0,\$a0,\$at
+0+0014 <[^>]*> addiu \$at,\$gp,0
+[ ]*14: [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_data_label
+0+0018 <[^>]*> lbu \$a0,[01]\(\$at\)
+0+001c <[^>]*> lbu \$at,[01]\(\$at\)
+0+0020 <[^>]*> sll \$a0,\$a0,0x8
+0+0024 <[^>]*> or \$a0,\$a0,\$at
+0+0028 <[^>]*> addiu \$at,\$gp,0
+[ ]*28: [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_data_label
+0+002c <[^>]*> lwl \$a0,[03]\(\$at\)
+0+0030 <[^>]*> lwr \$a0,[03]\(\$at\)
+0+0034 <[^>]*> addiu \$at,\$gp,0
+[ ]*34: [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_common
+0+0038 <[^>]*> sb \$a0,[01]\(\$at\)
+0+003c <[^>]*> srl \$a0,\$a0,0x8
+0+0040 <[^>]*> sb \$a0,[01]\(\$at\)
+0+0044 <[^>]*> lbu \$at,[01]\(\$at\)
+0+0048 <[^>]*> sll \$a0,\$a0,0x8
+0+004c <[^>]*> or \$a0,\$a0,\$at
+0+0050 <[^>]*> addiu \$at,\$gp,0
+[ ]*50: [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_common
+0+0054 <[^>]*> swl \$a0,[03]\(\$at\)
+0+0058 <[^>]*> swr \$a0,[03]\(\$at\)
+0+005c <[^>]*> addiu \$at,\$gp,-16384
+[ ]*5c: [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
+0+0060 <[^>]*> lb \$a0,[01]\(\$at\)
+0+0064 <[^>]*> lbu \$at,[01]\(\$at\)
+0+0068 <[^>]*> sll \$a0,\$a0,0x8
+0+006c <[^>]*> or \$a0,\$a0,\$at
+0+0070 <[^>]*> addiu \$at,\$gp,-15384
+[ ]*70: [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
+0+0074 <[^>]*> lbu \$a0,[01]\(\$at\)
+0+0078 <[^>]*> lbu \$at,[01]\(\$at\)
+0+007c <[^>]*> sll \$a0,\$a0,0x8
+0+0080 <[^>]*> or \$a0,\$a0,\$at
+0+0084 <[^>]*> addiu \$at,\$gp,-16383
+[ ]*84: [A-Z0-9_]*GPREL[A-Z0-9_]* .sdata.*
+0+0088 <[^>]*> lwl \$a0,[03]\(\$at\)
+0+008c <[^>]*> lwr \$a0,[03]\(\$at\)
+0+0090 <[^>]*> addiu \$at,\$gp,1
+[ ]*90: [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_data_label
+0+0094 <[^>]*> sb \$a0,[01]\(\$at\)
+0+0098 <[^>]*> srl \$a0,\$a0,0x8
+0+009c <[^>]*> sb \$a0,[01]\(\$at\)
+0+00a0 <[^>]*> lbu \$at,[01]\(\$at\)
+0+00a4 <[^>]*> sll \$a0,\$a0,0x8
+0+00a8 <[^>]*> or \$a0,\$a0,\$at
+0+00ac <[^>]*> addiu \$at,\$gp,1
+[ ]*ac: [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_data_label
+0+00b0 <[^>]*> swl \$a0,[03]\(\$at\)
+0+00b4 <[^>]*> swr \$a0,[03]\(\$at\)
+0+00b8 <[^>]*> addiu \$at,\$gp,1
+[ ]*b8: [A-Z0-9_]*GPREL[A-Z0-9_]* big_external_common
+0+00bc <[^>]*> lb \$a0,[01]\(\$at\)
+0+00c0 <[^>]*> lbu \$at,[01]\(\$at\)
+0+00c4 <[^>]*> sll \$a0,\$a0,0x8
+0+00c8 <[^>]*> or \$a0,\$a0,\$at
+0+00cc <[^>]*> addiu \$at,\$gp,1
+[ ]*cc: [A-Z0-9_]*GPREL[A-Z0-9_]* small_external_common
+0+00d0 <[^>]*> lbu \$a0,[01]\(\$at\)
+0+00d4 <[^>]*> lbu \$at,[01]\(\$at\)
+0+00d8 <[^>]*> sll \$a0,\$a0,0x8
+0+00dc <[^>]*> or \$a0,\$a0,\$at
+0+00e0 <[^>]*> addiu \$at,\$gp,-16383
+[ ]*e0: [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
+0+00e4 <[^>]*> lwl \$a0,[03]\(\$at\)
+0+00e8 <[^>]*> lwr \$a0,[03]\(\$at\)
+0+00ec <[^>]*> addiu \$at,\$gp,-15383
+[ ]*ec: [A-Z0-9_]*GPREL[A-Z0-9_]* .sbss.*
+0+00f0 <[^>]*> sb \$a0,[01]\(\$at\)
+0+00f4 <[^>]*> srl \$a0,\$a0,0x8
+0+00f8 <[^>]*> sb \$a0,[01]\(\$at\)
+0+00fc <[^>]*> lbu \$at,[01]\(\$at\)
+0+0100 <[^>]*> sll \$a0,\$a0,0x8
+0+0104 <[^>]*> or \$a0,\$a0,\$at
+ ...
diff --git a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-xgot.d b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-xgot.d
index dfa749805fb..a2666e96182 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-xgot.d
+++ b/gnu/usr.bin/binutils/gas/testsuite/gas/mips/ulh-xgot.d
@@ -1,4 +1,4 @@
-#objdump: -dr
+#objdump: -dr --prefix-addresses
#name: MIPS ulh-xgot
#as: -mips1 -KPIC -xgot
#source: ulh-pic.s
@@ -8,147 +8,147 @@
.*: +file format .*mips.*
Disassembly of section .text:
-0+0000 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0000 R_MIPS_GOT16 .data
-...
-0+0008 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+0008 R_MIPS_LO16 .data
-...
-0+0010 <[^>]*> lb \$a0,0\(\$at\)
-0+0014 <[^>]*> lbu \$at,1\(\$at\)
-0+0018 <[^>]*> sll \$a0,\$a0,0x8
-0+001c <[^>]*> or \$a0,\$a0,\$at
-0+0020 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0020 R_MIPS_GOT_HI16 big_external_data_label
-0+0024 <[^>]*> addu \$at,\$at,\$gp
-0+0028 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0028 R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0030 <[^>]*> lbu \$a0,0\(\$at\)
-0+0034 <[^>]*> lbu \$at,1\(\$at\)
-0+0038 <[^>]*> sll \$a0,\$a0,0x8
-0+003c <[^>]*> or \$a0,\$a0,\$at
-0+0040 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0040 R_MIPS_GOT_HI16 small_external_data_label
-0+0044 <[^>]*> addu \$at,\$at,\$gp
-0+0048 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0048 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0050 <[^>]*> lwl \$a0,0\(\$at\)
-0+0054 <[^>]*> lwr \$a0,3\(\$at\)
-0+0058 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0058 R_MIPS_GOT_HI16 big_external_common
-0+005c <[^>]*> addu \$at,\$at,\$gp
-0+0060 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0060 R_MIPS_GOT_LO16 big_external_common
-...
-0+0068 <[^>]*> sb \$a0,1\(\$at\)
-0+006c <[^>]*> srl \$a0,\$a0,0x8
-0+0070 <[^>]*> sb \$a0,0\(\$at\)
-0+0074 <[^>]*> lbu \$at,1\(\$at\)
-0+0078 <[^>]*> sll \$a0,\$a0,0x8
-0+007c <[^>]*> or \$a0,\$a0,\$at
-0+0080 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0080 R_MIPS_GOT_HI16 small_external_common
-0+0084 <[^>]*> addu \$at,\$at,\$gp
-0+0088 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0088 R_MIPS_GOT_LO16 small_external_common
-...
-0+0090 <[^>]*> swl \$a0,0\(\$at\)
-0+0094 <[^>]*> swr \$a0,3\(\$at\)
-0+0098 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0098 R_MIPS_GOT16 .bss
-...
-0+00a0 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+00a0 R_MIPS_LO16 .bss
-...
-0+00a8 <[^>]*> lb \$a0,0\(\$at\)
-0+00ac <[^>]*> lbu \$at,1\(\$at\)
-0+00b0 <[^>]*> sll \$a0,\$a0,0x8
-0+00b4 <[^>]*> or \$a0,\$a0,\$at
-0+00b8 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+00b8 R_MIPS_GOT16 .bss
-...
-0+00c0 <[^>]*> addiu \$at,\$at,1000
-[ ]*RELOC: 0+00c0 R_MIPS_LO16 .bss
-...
-0+00c8 <[^>]*> lbu \$a0,0\(\$at\)
-0+00cc <[^>]*> lbu \$at,1\(\$at\)
-0+00d0 <[^>]*> sll \$a0,\$a0,0x8
-0+00d4 <[^>]*> or \$a0,\$a0,\$at
-0+00d8 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+00d8 R_MIPS_GOT16 .data
-...
-0+00e0 <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+00e0 R_MIPS_LO16 .data
-...
-0+00e8 <[^>]*> addiu \$at,\$at,1
-0+00ec <[^>]*> lwl \$a0,0\(\$at\)
-0+00f0 <[^>]*> lwr \$a0,3\(\$at\)
-0+00f4 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+00f4 R_MIPS_GOT_HI16 big_external_data_label
-0+00f8 <[^>]*> addu \$at,\$at,\$gp
-0+00fc <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+00fc R_MIPS_GOT_LO16 big_external_data_label
-...
-0+0104 <[^>]*> addiu \$at,\$at,1
-0+0108 <[^>]*> sb \$a0,1\(\$at\)
-0+010c <[^>]*> srl \$a0,\$a0,0x8
-0+0110 <[^>]*> sb \$a0,0\(\$at\)
-0+0114 <[^>]*> lbu \$at,1\(\$at\)
-0+0118 <[^>]*> sll \$a0,\$a0,0x8
-0+011c <[^>]*> or \$a0,\$a0,\$at
-0+0120 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0120 R_MIPS_GOT_HI16 small_external_data_label
-0+0124 <[^>]*> addu \$at,\$at,\$gp
-0+0128 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0128 R_MIPS_GOT_LO16 small_external_data_label
-...
-0+0130 <[^>]*> addiu \$at,\$at,1
-0+0134 <[^>]*> swl \$a0,0\(\$at\)
-0+0138 <[^>]*> swr \$a0,3\(\$at\)
-0+013c <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+013c R_MIPS_GOT_HI16 big_external_common
-0+0140 <[^>]*> addu \$at,\$at,\$gp
-0+0144 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0144 R_MIPS_GOT_LO16 big_external_common
-...
-0+014c <[^>]*> addiu \$at,\$at,1
-0+0150 <[^>]*> lb \$a0,0\(\$at\)
-0+0154 <[^>]*> lbu \$at,1\(\$at\)
-0+0158 <[^>]*> sll \$a0,\$a0,0x8
-0+015c <[^>]*> or \$a0,\$a0,\$at
-0+0160 <[^>]*> lui \$at,0x0
-[ ]*RELOC: 0+0160 R_MIPS_GOT_HI16 small_external_common
-0+0164 <[^>]*> addu \$at,\$at,\$gp
-0+0168 <[^>]*> lw \$at,0\(\$at\)
-[ ]*RELOC: 0+0168 R_MIPS_GOT_LO16 small_external_common
-...
-0+0170 <[^>]*> addiu \$at,\$at,1
-0+0174 <[^>]*> lbu \$a0,0\(\$at\)
-0+0178 <[^>]*> lbu \$at,1\(\$at\)
-0+017c <[^>]*> sll \$a0,\$a0,0x8
-0+0180 <[^>]*> or \$a0,\$a0,\$at
-0+0184 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+0184 R_MIPS_GOT16 .bss
-...
-0+018c <[^>]*> addiu \$at,\$at,0
-[ ]*RELOC: 0+018c R_MIPS_LO16 .bss
-...
-0+0194 <[^>]*> addiu \$at,\$at,1
-0+0198 <[^>]*> lwl \$a0,0\(\$at\)
-0+019c <[^>]*> lwr \$a0,3\(\$at\)
-0+01a0 <[^>]*> lw \$at,0\(\$gp\)
-[ ]*RELOC: 0+01a0 R_MIPS_GOT16 .bss
-...
-0+01a8 <[^>]*> addiu \$at,\$at,1000
-[ ]*RELOC: 0+01a8 R_MIPS_LO16 .bss
-...
-0+01b0 <[^>]*> addiu \$at,\$at,1
-0+01b4 <[^>]*> sb \$a0,1\(\$at\)
-0+01b8 <[^>]*> srl \$a0,\$a0,0x8
-0+01bc <[^>]*> sb \$a0,0\(\$at\)
-0+01c0 <[^>]*> lbu \$at,1\(\$at\)
-0+01c4 <[^>]*> sll \$a0,\$a0,0x8
-0+01c8 <[^>]*> or \$a0,\$a0,\$at
-...
+0+0000 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*0: R_MIPS_GOT16 .data
+0+0004 <[^>]*> nop
+0+0008 <[^>]*> addiu \$at,\$at,0
+[ ]*8: R_MIPS_LO16 .data
+0+000c <[^>]*> nop
+0+0010 <[^>]*> lb \$a0,0\(\$at\)
+0+0014 <[^>]*> lbu \$at,1\(\$at\)
+0+0018 <[^>]*> sll \$a0,\$a0,0x8
+0+001c <[^>]*> or \$a0,\$a0,\$at
+0+0020 <[^>]*> lui \$at,0x0
+[ ]*20: R_MIPS_GOT_HI16 big_external_data_label
+0+0024 <[^>]*> addu \$at,\$at,\$gp
+0+0028 <[^>]*> lw \$at,0\(\$at\)
+[ ]*28: R_MIPS_GOT_LO16 big_external_data_label
+0+002c <[^>]*> nop
+0+0030 <[^>]*> lbu \$a0,0\(\$at\)
+0+0034 <[^>]*> lbu \$at,1\(\$at\)
+0+0038 <[^>]*> sll \$a0,\$a0,0x8
+0+003c <[^>]*> or \$a0,\$a0,\$at
+0+0040 <[^>]*> lui \$at,0x0
+[ ]*40: R_MIPS_GOT_HI16 small_external_data_label
+0+0044 <[^>]*> addu \$at,\$at,\$gp
+0+0048 <[^>]*> lw \$at,0\(\$at\)
+[ ]*48: R_MIPS_GOT_LO16 small_external_data_label
+0+004c <[^>]*> nop
+0+0050 <[^>]*> lwl \$a0,0\(\$at\)
+0+0054 <[^>]*> lwr \$a0,3\(\$at\)
+0+0058 <[^>]*> lui \$at,0x0
+[ ]*58: R_MIPS_GOT_HI16 big_external_common
+0+005c <[^>]*> addu \$at,\$at,\$gp
+0+0060 <[^>]*> lw \$at,0\(\$at\)
+[ ]*60: R_MIPS_GOT_LO16 big_external_common
+0+0064 <[^>]*> nop
+0+0068 <[^>]*> sb \$a0,1\(\$at\)
+0+006c <[^>]*> srl \$a0,\$a0,0x8
+0+0070 <[^>]*> sb \$a0,0\(\$at\)
+0+0074 <[^>]*> lbu \$at,1\(\$at\)
+0+0078 <[^>]*> sll \$a0,\$a0,0x8
+0+007c <[^>]*> or \$a0,\$a0,\$at
+0+0080 <[^>]*> lui \$at,0x0
+[ ]*80: R_MIPS_GOT_HI16 small_external_common
+0+0084 <[^>]*> addu \$at,\$at,\$gp
+0+0088 <[^>]*> lw \$at,0\(\$at\)
+[ ]*88: R_MIPS_GOT_LO16 small_external_common
+0+008c <[^>]*> nop
+0+0090 <[^>]*> swl \$a0,0\(\$at\)
+0+0094 <[^>]*> swr \$a0,3\(\$at\)
+0+0098 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*98: R_MIPS_GOT16 .bss
+0+009c <[^>]*> nop
+0+00a0 <[^>]*> addiu \$at,\$at,0
+[ ]*a0: R_MIPS_LO16 .bss
+0+00a4 <[^>]*> nop
+0+00a8 <[^>]*> lb \$a0,0\(\$at\)
+0+00ac <[^>]*> lbu \$at,1\(\$at\)
+0+00b0 <[^>]*> sll \$a0,\$a0,0x8
+0+00b4 <[^>]*> or \$a0,\$a0,\$at
+0+00b8 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*b8: R_MIPS_GOT16 .bss
+0+00bc <[^>]*> nop
+0+00c0 <[^>]*> addiu \$at,\$at,1000
+[ ]*c0: R_MIPS_LO16 .bss
+0+00c4 <[^>]*> nop
+0+00c8 <[^>]*> lbu \$a0,0\(\$at\)
+0+00cc <[^>]*> lbu \$at,1\(\$at\)
+0+00d0 <[^>]*> sll \$a0,\$a0,0x8
+0+00d4 <[^>]*> or \$a0,\$a0,\$at
+0+00d8 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*d8: R_MIPS_GOT16 .data
+0+00dc <[^>]*> nop
+0+00e0 <[^>]*> addiu \$at,\$at,0
+[ ]*e0: R_MIPS_LO16 .data
+0+00e4 <[^>]*> nop
+0+00e8 <[^>]*> addiu \$at,\$at,1
+0+00ec <[^>]*> lwl \$a0,0\(\$at\)
+0+00f0 <[^>]*> lwr \$a0,3\(\$at\)
+0+00f4 <[^>]*> lui \$at,0x0
+[ ]*f4: R_MIPS_GOT_HI16 big_external_data_label
+0+00f8 <[^>]*> addu \$at,\$at,\$gp
+0+00fc <[^>]*> lw \$at,0\(\$at\)
+[ ]*fc: R_MIPS_GOT_LO16 big_external_data_label
+0+0100 <[^>]*> nop
+0+0104 <[^>]*> addiu \$at,\$at,1
+0+0108 <[^>]*> sb \$a0,1\(\$at\)
+0+010c <[^>]*> srl \$a0,\$a0,0x8
+0+0110 <[^>]*> sb \$a0,0\(\$at\)
+0+0114 <[^>]*> lbu \$at,1\(\$at\)
+0+0118 <[^>]*> sll \$a0,\$a0,0x8
+0+011c <[^>]*> or \$a0,\$a0,\$at
+0+0120 <[^>]*> lui \$at,0x0
+[ ]*120: R_MIPS_GOT_HI16 small_external_data_label
+0+0124 <[^>]*> addu \$at,\$at,\$gp
+0+0128 <[^>]*> lw \$at,0\(\$at\)
+[ ]*128: R_MIPS_GOT_LO16 small_external_data_label
+0+012c <[^>]*> nop
+0+0130 <[^>]*> addiu \$at,\$at,1
+0+0134 <[^>]*> swl \$a0,0\(\$at\)
+0+0138 <[^>]*> swr \$a0,3\(\$at\)
+0+013c <[^>]*> lui \$at,0x0
+[ ]*13c: R_MIPS_GOT_HI16 big_external_common
+0+0140 <[^>]*> addu \$at,\$at,\$gp
+0+0144 <[^>]*> lw \$at,0\(\$at\)
+[ ]*144: R_MIPS_GOT_LO16 big_external_common
+0+0148 <[^>]*> nop
+0+014c <[^>]*> addiu \$at,\$at,1
+0+0150 <[^>]*> lb \$a0,0\(\$at\)
+0+0154 <[^>]*> lbu \$at,1\(\$at\)
+0+0158 <[^>]*> sll \$a0,\$a0,0x8
+0+015c <[^>]*> or \$a0,\$a0,\$at
+0+0160 <[^>]*> lui \$at,0x0
+[ ]*160: R_MIPS_GOT_HI16 small_external_common
+0+0164 <[^>]*> addu \$at,\$at,\$gp
+0+0168 <[^>]*> lw \$at,0\(\$at\)
+[ ]*168: R_MIPS_GOT_LO16 small_external_common
+0+016c <[^>]*> nop
+0+0170 <[^>]*> addiu \$at,\$at,1
+0+0174 <[^>]*> lbu \$a0,0\(\$at\)
+0+0178 <[^>]*> lbu \$at,1\(\$at\)
+0+017c <[^>]*> sll \$a0,\$a0,0x8
+0+0180 <[^>]*> or \$a0,\$a0,\$at
+0+0184 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*184: R_MIPS_GOT16 .bss
+0+0188 <[^>]*> nop
+0+018c <[^>]*> addiu \$at,\$at,0
+[ ]*18c: R_MIPS_LO16 .bss
+0+0190 <[^>]*> nop
+0+0194 <[^>]*> addiu \$at,\$at,1
+0+0198 <[^>]*> lwl \$a0,0\(\$at\)
+0+019c <[^>]*> lwr \$a0,3\(\$at\)
+0+01a0 <[^>]*> lw \$at,0\(\$gp\)
+[ ]*1a0: R_MIPS_GOT16 .bss
+0+01a4 <[^>]*> nop
+0+01a8 <[^>]*> addiu \$at,\$at,1000
+[ ]*1a8: R_MIPS_LO16 .bss
+0+01ac <[^>]*> nop
+0+01b0 <[^>]*> addiu \$at,\$at,1
+0+01b4 <[^>]*> sb \$a0,1\(\$at\)
+0+01b8 <[^>]*> srl \$a0,\$a0,0x8
+0+01bc <[^>]*> sb \$a0,0\(\$at\)
+0+01c0 <[^>]*> lbu \$at,1\(\$at\)
+0+01c4 <[^>]*> sll \$a0,\$a0,0x8
+0+01c8 <[^>]*> or \$a0,\$a0,\$at
+0+01cc <[^>]*> nop
diff --git a/gnu/usr.bin/binutils/gas/testsuite/lib/gas-defs.exp b/gnu/usr.bin/binutils/gas/testsuite/lib/gas-defs.exp
index 3c537141abc..20ed5ecb092 100644
--- a/gnu/usr.bin/binutils/gas/testsuite/lib/gas-defs.exp
+++ b/gnu/usr.bin/binutils/gas/testsuite/lib/gas-defs.exp
@@ -24,10 +24,11 @@ proc gas_version {} {
catch "exec $AS -version < /dev/null" tmp
# Should find a way to discard constant parts, keep whatever's
# left, so the version string could be almost anything at all...
- regexp "version (cygnus-|)\[-0-9.a-zA-Z-\]+" $tmp version
- set tmp $version
- clone_output "[which $AS] $version\n"
- unset tmp
+ regexp "\[^\n\]* (cygnus-|)(\[-0-9.a-zA-Z-\]+)\[\r\n\].*" $tmp version cyg number
+ if ![info exists number] then {
+ return "[which $AS] (no version number)\n"
+ }
+ clone_output "[which $AS] $number\n"
unset version
}
diff --git a/gnu/usr.bin/binutils/gas/xmalloc.c b/gnu/usr.bin/binutils/gas/xmalloc.c
deleted file mode 100644
index d2639a29166..00000000000
--- a/gnu/usr.bin/binutils/gas/xmalloc.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* xmalloc.c - get memory or bust
-
- Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
-
- This file is part of GAS, the GNU Assembler.
-
- GAS is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- GAS is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GAS; see the file COPYING. If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/*
- NAME
- xmalloc() - get memory or bust
- INDEX
- xmalloc() uses malloc()
-
- SYNOPSIS
- char * my_memory;
-
- my_memory = xmalloc(42); / * my_memory gets address of 42 chars * /
-
- DESCRIPTION
-
- Use xmalloc() as an "error-free" malloc(). It does almost the same job.
- When it cannot honour your request for memory it BOMBS your program
- with a "virtual memory exceeded" message. Malloc() returns NULL and
- does not bomb your program.
-
- SEE ALSO
- malloc()
-
- */
-
-#include "as.h"
-
-#define error as_fatal
-
-PTR
-xmalloc (n)
- unsigned long n;
-{
- PTR retval;
-
- retval = malloc (n);
- if (retval == NULL)
- error ("virtual memory exceeded");
- return (retval);
-}
-
-PTR
-xrealloc (ptr, n)
- register PTR ptr;
- unsigned long n;
-{
- ptr = realloc (ptr, n);
- if (ptr == 0)
- error ("virtual memory exceeded");
- return (ptr);
-}
-/* end of xmalloc.c */