From 377260ba3af89e31f1051de370ace5d3b3892446 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 19 May 2006 10:18:02 +0000 Subject: [PATCH] * gas/config/tc-m68k.c (m68k_init_arch): Move checking of cfloat/m68881 to correct architecture before using it. --- gas/ChangeLog | 5 +++++ gas/config/tc-m68k.c | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 0acf61a148..20a5a16b29 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2006-05-19 Nathan Sidwell + + * gas/config/tc-m68k.c (m68k_init_arch): Move checking of + cfloat/m68881 to correct architecture before using it. + 2006-05-16 Bjoern Haase * config/tc-avr.h (TC_VALIDATE_FIX): Allow fixups for immediate diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c index f370e6cf8e..6cf85d7e60 100644 --- a/gas/config/tc-m68k.c +++ b/gas/config/tc-m68k.c @@ -7233,6 +7233,15 @@ m68k_init_arch (void) current_architecture &= ~not_current_architecture; + if ((current_architecture & (cfloat | m68881)) == (cfloat | m68881)) + { + /* Determine which float is really meant. */ + if (current_architecture & (m68k_mask & ~m68881)) + current_architecture ^= cfloat; + else + current_architecture ^= m68881; + } + if (selected_cpu) { control_regs = selected_cpu->control_regs; @@ -7244,15 +7253,6 @@ m68k_init_arch (void) } } - if ((current_architecture & (cfloat | m68881)) == (cfloat | m68881)) - { - /* Determine which float is really meant. */ - if (current_architecture & (m68k_mask & ~m68881)) - current_architecture ^= cfloat; - else - current_architecture ^= m68881; - } - if ((current_architecture & m68k_mask) && (current_architecture & ~m68k_mask)) {