update copyright dates

[deliverable/binutils-gdb.git] / bfd / cpu-avr.c

diff --git a/bfd/cpu-avr.c b/bfd/cpu-avr.c
index 364f64ea2e321843a61cb6d4e8a2ba417f952ce4..9e62ab41f98fd107d4a427ead16882e9c6a53655 100644 (file)
--- a/bfd/cpu-avr.c
+++ b/bfd/cpu-avr.c
@@ -1,5 +1,6 @@
 /* BFD library support routines for the AVR architecture.
-   Copyright 1999, 2000, 2002, 2006, 2007 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2002, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
    Contributed by Denis Chertykov <denisc@overta.ru>
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -38,7 +39,13 @@ compatible (const bfd_arch_info_type * a,
   if (a->mach == b->mach)
     return a;
 
-  if (a->mach <= bfd_mach_avr6 && b->mach <= bfd_mach_avr6)
+  /* avr-6 is compatible only with itself as its call convention is not
+     compatible with other avr (the mcu saves the return address on 3 bytes
+     instead of 2).  */
+  if (a->mach == bfd_mach_avr6 || b->mach == bfd_mach_avr6)
+    return NULL;
+
+  if (a->mach < bfd_mach_avr6 && b->mach < bfd_mach_avr6)
     {
       /* Special case for ATmega[16]03 (avr:3) and ATmega83 (avr:4).  */
       if ((a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr4)