OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[bfd/] 

* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Merge ASE
	flags into resulting BFD.

[ld/testsuite/]
	* ld-mips-elf/mips16-1.d,
	* ld-mips-elf/mips16-1[ab].s: New test.
	* ld-mips-elf/mips-elf.exp: Run it.
This commit is contained in:
Richard Sandiford 2002-07-26 18:56:25 +00:00
parent 7dcd22c276
commit fb39dac1ef
7 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2002-07-26 Chris Demetriou <cgd@broadcom.com>
* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Merge ASE
flags into resulting BFD.
2002-07-26 Alan Modra <amodra@bigpond.net.au>
From John Reiser <jreiser@BitWagon.com>

9
bfd/elfxx-mips.c
View File

@ -7803,6 +7803,15 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
old_flags &= ~EF_MIPS_ABI;
}
/* For now, allow arbitrary mixing of ASEs (retain the union). */
if ((new_flags & EF_MIPS_ARCH_ASE) != (old_flags & EF_MIPS_ARCH_ASE))
{
elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_ARCH_ASE;
new_flags &= ~ EF_MIPS_ARCH_ASE;
old_flags &= ~ EF_MIPS_ARCH_ASE;
}
/* Warn about any other mismatches */
if (new_flags != old_flags)
{

6
ld/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2002-07-26 Richard Sandiford <rsandifo@redhat.com>
* ld-mips-elf/mips16-1.d,
* ld-mips-elf/mips16-1[ab].s: New test.
* ld-mips-elf/mips-elf.exp: Run it.
2002-07-19 Hans-Peter Nilsson <hp@bitrange.com>
* ld-mmix/sec-1.d: Adjust for changes in padding.

2
ld/testsuite/ld-mips-elf/mips-elf.exp
View File

@ -39,6 +39,8 @@ if { [istarget mips*-*-*] } then {
run_dump_test "emrelocs-eb"
run_dump_test "emrelocs-el"
run_dump_test "mips16-1"
run_dump_test "region1"
}
}

5
ld/testsuite/ld-mips-elf/mips16-1.d Normal file
View File

@ -0,0 +1,5 @@
#source: mips16-1a.s -no-mips16
#source: mips16-1b.s -mips16
#ld: -r
#objdump: -d
#pass

2
ld/testsuite/ld-mips-elf/mips16-1a.s Normal file
View File

@ -0,0 +1,2 @@
.text
foo1: jr $31

2
ld/testsuite/ld-mips-elf/mips16-1b.s Normal file
View File

@ -0,0 +1,2 @@
.text
foo2: jr $31