diff options
| author | Nick Clifton <nickc@redhat.com> | 1997-12-16 00:12:39 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 1997-12-16 00:12:39 +0000 |
| commit | 2e0a5c1051afa19dd41d47c42db5f2f3a863c56a (patch) | |
| tree | ca41b927e089daf15e8357273210963164265b86 /bfd/elf32-m32r.c | |
| parent | ee73be4088d18a2ecb0af5a90e0c5cd9d2e0609e (diff) | |
| download | gdb-2e0a5c1051afa19dd41d47c42db5f2f3a863c56a.zip gdb-2e0a5c1051afa19dd41d47c42db5f2f3a863c56a.tar.gz gdb-2e0a5c1051afa19dd41d47c42db5f2f3a863c56a.tar.bz2 | |
improve support for m32rx processor.
Diffstat (limited to 'bfd/elf32-m32r.c')
| -rw-r--r-- | bfd/elf32-m32r.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 3da71e2..39decd2 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -1837,12 +1837,20 @@ m32r_elf_merge_private_bfd_data (ibfd, obfd) if ((new_flags & EF_M32R_ARCH) != (old_flags & EF_M32R_ARCH)) { - _bfd_error_handler ("%s: Instruction set mismatch with previous modules", - bfd_get_filename (ibfd)); + if ((new_flags & EF_M32R_ARCH) == E_M32RX_ARCH) + { + _bfd_error_handler ("%s: Instruction set mismatch with previous modules", + bfd_get_filename (ibfd)); #if 1 - bfd_set_error (bfd_error_bad_value); - return false; + bfd_set_error (bfd_error_bad_value); + return false; #endif + } + else + { + _bfd_error_handler ("%s: Merging M32R instructions with M32RX instructions", + bfd_get_filename (ibfd)); + } } return true; |