diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-sh64.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 5b07657..7974e2f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2005-08-18 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * config/tc-sh64.c (sh64_target_format): Check preset_target_arch + to confirm that no ISA is specified. + 2005-08-18 Nick Clifton <nickc@redhat.com> * write.c (relax_segment): Count the number of frags being diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c index d5e8646..7964579 100644 --- a/gas/config/tc-sh64.c +++ b/gas/config/tc-sh64.c @@ -2928,14 +2928,14 @@ sh64_target_format (void) { #ifdef TE_NetBSD /* For NetBSD, if the ISA is unspecified, always use SHmedia. */ - if (sh64_isa_mode == sh64_isa_unspecified) + if (preset_target_arch == 0 && sh64_isa_mode == sh64_isa_unspecified) sh64_isa_mode = sh64_isa_shmedia; /* If the ABI is unspecified, select a default: based on how we were configured: sh64 == sh64_abi_64, else sh64_abi_32. */ if (sh64_abi == sh64_abi_unspecified) { - if (sh64_isa_mode == sh64_isa_shcompact) + if (preset_target_arch != 0 || sh64_isa_mode == sh64_isa_shcompact) sh64_abi = sh64_abi_32; else if (strncmp (TARGET_CPU, "sh64", 4) == 0) sh64_abi = sh64_abi_64; @@ -2945,7 +2945,7 @@ sh64_target_format (void) #endif #ifdef TE_LINUX - if (sh64_isa_mode == sh64_isa_unspecified) + if (preset_target_arch == 0 && sh64_isa_mode == sh64_isa_unspecified) sh64_isa_mode = sh64_isa_shmedia; if (sh64_abi == sh64_abi_unspecified) |