diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2008-07-08 06:33:41 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2008-07-08 06:33:41 +0000 |
| commit | bfbba8e4eef2c9b7bffabda7064532ecdc0ef27f (patch) | |
| tree | a2f186e04ef05ca019b582d518b8c6df527d5f69 /gas | |
| parent | 63f22691bbbb020eb88ae6a17499838d5f457612 (diff) | |
| download | gdb-bfbba8e4eef2c9b7bffabda7064532ecdc0ef27f.zip gdb-bfbba8e4eef2c9b7bffabda7064532ecdc0ef27f.tar.gz gdb-bfbba8e4eef2c9b7bffabda7064532ecdc0ef27f.tar.bz2 | |
* config/tc-m68k.c (m68k_set_cpu, m68k_set_arch): Don't complain
about overriding an earlier setting.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-m68k.c | 19 |
2 files changed, 7 insertions, 17 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index bb82182..16ee4de 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2008-07-08 Nathan Sidwell <nathan@codesourcery.com> + + * config/tc-m68k.c (m68k_set_cpu, m68k_set_arch): Don't complain + about overriding an earlier setting. + 2008-07-07 Adam Nemet <anemet@caviumnetworks.com> * config/tc-mips.c (NO_ISA_COP): New macro. diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c index 81e4cc7..9e969c3 100644 --- a/gas/config/tc-m68k.c +++ b/gas/config/tc-m68k.c @@ -7229,7 +7229,7 @@ m68k_lookup_cpu (const char *arg, const struct m68k_cpu *table, return 0; } -/* Set the cpu, issuing errors if it is unrecognized, or invalid */ +/* Set the cpu, issuing errors if it is unrecognized. */ static int m68k_set_cpu (char const *name, int allow_m, int silent) @@ -7244,18 +7244,11 @@ m68k_set_cpu (char const *name, int allow_m, int silent) as_bad (_("cpu `%s' unrecognized"), name); return 0; } - - if (selected_cpu && selected_cpu != cpu) - { - as_bad (_("already selected `%s' processor"), - selected_cpu->name); - return 0; - } selected_cpu = cpu; return 1; } -/* Set the architecture, issuing errors if it is unrecognized, or invalid */ +/* Set the architecture, issuing errors if it is unrecognized. */ static int m68k_set_arch (char const *name, int allow_m, int silent) @@ -7270,14 +7263,6 @@ m68k_set_arch (char const *name, int allow_m, int silent) as_bad (_("architecture `%s' unrecognized"), name); return 0; } - - if (selected_arch && selected_arch != arch) - { - as_bad (_("already selected `%s' architecture"), - selected_arch->name); - return 0; - } - selected_arch = arch; return 1; } |