X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-avr.c;h=029b416e186f00157f3225a53c75c60a3ebddc5a;hb=11c0dd51e8675c923fe40f2d1ad09269bfe9978a;hp=ed172f00fcff3e46c72e54920dc1706b30c21c79;hpb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cpu-avr.c b/bfd/cpu-avr.c index ed172f00fc..029b416e18 100644 --- a/bfd/cpu-avr.c +++ b/bfd/cpu-avr.c @@ -1,5 +1,5 @@ /* BFD library support routines for the AVR architecture. - Copyright (C) 1999-2015 Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. Contributed by Denis Chertykov This file is part of BFD, the Binary File Descriptor library. @@ -48,7 +48,7 @@ compatible (const bfd_arch_info_type * a, { /* Special case for ATmega[16]03 (avr:3) and ATmega83 (avr:4). */ if ((a->mach == bfd_mach_avr3 && b->mach == bfd_mach_avr4) - || (a->mach == bfd_mach_avr4 && b->mach == bfd_mach_avr3)) + || (a->mach == bfd_mach_avr4 && b->mach == bfd_mach_avr3)) return NULL; if (a->mach <= b->mach) @@ -82,9 +82,9 @@ compatible (const bfd_arch_info_type * a, #define N(addr_bits, machine, print, default, next) \ { \ - 8, /* 8 bits in a word. */ \ - addr_bits, /* bits in an address. */ \ - 8, /* 8 bits in a byte. */ \ + 8, /* Bits in a word. */ \ + addr_bits, /* Bits in an address. */ \ + 8, /* Bits in a byte. */ \ bfd_arch_avr, \ machine, /* Machine number. */ \ "avr", /* Architecture name. */ \ @@ -94,7 +94,8 @@ compatible (const bfd_arch_info_type * a, compatible, \ bfd_default_scan, \ bfd_arch_default_fill, \ - next \ + next, \ + 0 /* Maximum offset of a reloc from the start of an insn. */ \ } static const bfd_arch_info_type arch_info_struct[] = @@ -141,19 +142,19 @@ static const bfd_arch_info_type arch_info_struct[] = /* Xmega 2. */ N (24, bfd_mach_avrxmega2, "avr:102", FALSE, & arch_info_struct[13]), - + /* Xmega 3. */ N (24, bfd_mach_avrxmega3, "avr:103", FALSE, & arch_info_struct[14]), - + /* Xmega 4. */ N (24, bfd_mach_avrxmega4, "avr:104", FALSE, & arch_info_struct[15]), - + /* Xmega 5. */ N (24, bfd_mach_avrxmega5, "avr:105", FALSE, & arch_info_struct[16]), - + /* Xmega 6. */ N (24, bfd_mach_avrxmega6, "avr:106", FALSE, & arch_info_struct[17]), - + /* Xmega 7. */ N (24, bfd_mach_avrxmega7, "avr:107", FALSE, NULL)