Fix error messages in the NFP sources when building for 32-bit targets.

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

diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c
index 9ec18a0676af8abcad880843d7af8562da3f0202..44cee6c98a5a46e7b382745d5ed992ad1717eb86 100644 (file)
--- a/bfd/cpu-aarch64.c
+++ b/bfd/cpu-aarch64.c
@@ -1,5 +1,5 @@
 /* BFD support for AArch64.
 /* BFD support for AArch64.

-   Copyright 2009, 2010, 2011, 2012  Free Software Foundation, Inc.
+   Copyright (C) 2009-2018 Free Software Foundation, Inc.

    Contributed by ARM Ltd.
 
    This file is part of BFD, the Binary File Descriptor library.
    Contributed by ARM Ltd.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -100,16 +100,16 @@ scan (const struct bfd_arch_info *info, const char *string)
   return FALSE;
 }
 
   return FALSE;
 }
 

-#define N(NUMBER, PRINT, DEFAULT, NEXT)                                \
-  { 64, 64, 8, bfd_arch_aarch64, NUMBER,                       \
+#define N(NUMBER, PRINT, WORDSIZE, DEFAULT, NEXT)              \
+  { WORDSIZE, WORDSIZE, 8, bfd_arch_aarch64, NUMBER,           \

     "aarch64", PRINT, 4, DEFAULT, compatible, scan,            \
     bfd_arch_default_fill, NEXT }
 
 static const bfd_arch_info_type bfd_aarch64_arch_ilp32 =
     "aarch64", PRINT, 4, DEFAULT, compatible, scan,            \
     bfd_arch_default_fill, NEXT }
 
 static const bfd_arch_info_type bfd_aarch64_arch_ilp32 =

-  N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", FALSE, NULL);
+  N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", 32, FALSE, NULL);

 
 const bfd_arch_info_type bfd_aarch64_arch =
 
 const bfd_arch_info_type bfd_aarch64_arch =

-  N (0, "aarch64", TRUE, &bfd_aarch64_arch_ilp32);
+  N (0, "aarch64", 64, TRUE, &bfd_aarch64_arch_ilp32);

 
 bfd_boolean
 bfd_is_aarch64_special_symbol_name (const char *name, int type)
 
 bfd_boolean
 bfd_is_aarch64_special_symbol_name (const char *name, int type)