diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-ppc.c | 5 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/ppc/astest2.d | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 184d306..a56c7d6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2012-11-23 Alan Modra <amodra@gmail.com> + + * config/tc-ppc.c (sticky): New var. + (md_parse_option, ppc_machine): Update ppc_parse_cpu calls. + 2012-11-21 Edgar E. Iglesias <edgar.iglesias@gmail.com> * config/tc-microblaze.c (parse_reg): Parse REG_SLR, REG_SHR diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index de13ab1..e9df056 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -223,6 +223,7 @@ unsigned long nop_limit = 4; /* The type of processor we are assembling for. This is one or more of the PPC_OPCODE flags defined in opcode/ppc.h. */ ppc_cpu_t ppc_cpu = 0; +ppc_cpu_t sticky = 0; /* Flags set on encountering toc relocs. */ enum { @@ -1160,7 +1161,7 @@ md_parse_option (int c, char *arg) break; case 'm': - new_cpu = ppc_parse_cpu (ppc_cpu, arg); + new_cpu = ppc_parse_cpu (ppc_cpu, &sticky, arg); if (new_cpu != 0) { ppc_cpu = new_cpu; @@ -4863,7 +4864,7 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) else ppc_cpu = cpu_history[--curr_hist]; } - else if ((new_cpu = ppc_parse_cpu (ppc_cpu, cpu_string)) != 0) + else if ((new_cpu = ppc_parse_cpu (ppc_cpu, &sticky, cpu_string)) != 0) ppc_cpu = new_cpu; else as_bad (_("invalid machine `%s'"), cpu_string); diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 2661ff4..963ed8f 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-11-23 Alan Modra <amodra@gmail.com> + + * gas/ppc/astest2.d: Pass -Mppc to objdump. + 2012-11-21 David Holsgrove <david.holsgrove@xilinx.com> * gas/microblaze/allinsn.s: Add swapb, swaph diff --git a/gas/testsuite/gas/ppc/astest2.d b/gas/testsuite/gas/ppc/astest2.d index ddbd952..972b9a5 100644 --- a/gas/testsuite/gas/ppc/astest2.d +++ b/gas/testsuite/gas/ppc/astest2.d @@ -1,4 +1,4 @@ -#objdump: -Dr +#objdump: -Dr -Mppc #name: PowerPC test 2 .* |