diff options
| author | Nick Clifton <nickc@redhat.com> | 2010-01-13 14:34:13 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2010-01-13 14:34:13 +0000 |
| commit | 91b9a4a49bdd97dcf8ade3b3819f37646e0806d1 (patch) | |
| tree | b31ee1fc4ff05fbc1aa07423e8dd0dbdfe16147c /bfd | |
| parent | 52b010e4424ced5700579389375a536b614f8b19 (diff) | |
| download | gdb-91b9a4a49bdd97dcf8ade3b3819f37646e0806d1.zip gdb-91b9a4a49bdd97dcf8ade3b3819f37646e0806d1.tar.gz gdb-91b9a4a49bdd97dcf8ade3b3819f37646e0806d1.tar.bz2 | |
* cpu-m32c.c (m32c_scan): New function. Ensures that a scan for
"m32c" returns the m32c arch_info_struct and not the m16c
arch_info_struct.
(arch_info_struct): Use the new scan function.
(bfd_m32c_arch): Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/cpu-m32c.c | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 06bbc5b..e8cadfb 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2010-01-13 Nick Clifton <nickc@redhat.com> + + * cpu-m32c.c (m32c_scan): New function. Ensures that a scan for + "m32c" returns the m32c arch_info_struct and not the m16c + arch_info_struct. + (arch_info_struct): Use the new scan function. + (bfd_m32c_arch): Likewise. + 2010-01-13 Tristan Gingold <gingold@adacore.com> * config.bfd: Remove duplicated target vector for i386-*-darwin. diff --git a/bfd/cpu-m32c.c b/bfd/cpu-m32c.c index aa2e28d..d2f9cb1 100644 --- a/bfd/cpu-m32c.c +++ b/bfd/cpu-m32c.c @@ -22,6 +22,19 @@ #include "bfd.h" #include "libbfd.h" +/* Like bfd_default_scan but if the string is just "m32c" then + skip the m16c architecture. */ + +static bfd_boolean +m32c_scan (const bfd_arch_info_type * info, const char * string) +{ + if (strcmp (string, "m32c") == 0 + && info->mach == bfd_mach_m16c) + return FALSE; + + return bfd_default_scan (info, string); +} + static const bfd_arch_info_type arch_info_struct[] = { { @@ -35,7 +48,7 @@ static const bfd_arch_info_type arch_info_struct[] = 3, /* section align power */ FALSE, /* the default ? */ bfd_default_compatible, /* architecture comparison fn */ - bfd_default_scan, /* string to architecture convert fn */ + m32c_scan, /* string to architecture convert fn */ NULL /* next in list */ }, }; @@ -52,6 +65,6 @@ const bfd_arch_info_type bfd_m32c_arch = 4, /* Section align power. */ TRUE, /* The default ? */ bfd_default_compatible, /* Architecture comparison fn. */ - bfd_default_scan, /* String to architecture convert fn. */ + m32c_scan, /* String to architecture convert fn. */ &arch_info_struct[0], /* Next in list. */ }; |