diff options
Diffstat (limited to 'gas/config/tc-hppa.c')
| -rw-r--r-- | gas/config/tc-hppa.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c index 57cc427ccb..398e7462cc 100644 --- a/gas/config/tc-hppa.c +++ b/gas/config/tc-hppa.c @@ -1641,21 +1641,9 @@ pa_ip (str) the_insn.reloc = R_HPPA_NONE; - /* If this instruction is specific to a particular architecture, - then set a new architecture. */ - /* But do not automatically promote to pa2.0. The automatic promotion - crud is for compatibility with HP's old assemblers only. */ - if (insn->arch < 20 + if (insn->arch >= 20 && bfd_get_mach (stdoutput) < insn->arch) - { - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, insn->arch)) - as_warn (_("could not update architecture and machine")); - } - else if (bfd_get_mach (stdoutput) < insn->arch) - { - match = FALSE; - goto failed; - } + goto failed; /* Build the opcode, checking as we go to make sure that the operands match. */ @@ -3962,6 +3950,16 @@ pa_ip (str) break; } + /* If this instruction is specific to a particular architecture, + then set a new architecture. This automatic promotion crud is + for compatibility with HP's old assemblers only. */ + if (match == TRUE + && bfd_get_mach (stdoutput) < insn->arch) + { + if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, insn->arch)) + as_warn (_("could not update architecture and machine")); + } + failed: /* Check if the args matched. */ if (!match) |
