PR25031, nm reports wrong address on 32bit

[external/binutils.git] / binutils / emul_aix.c

diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c
index e891e78..c1e3e4f 100644 (file)
--- a/binutils/emul_aix.c
+++ b/binutils/emul_aix.c
@@ -1,5 +1,5 @@
 /* Binutils emulation layer.
 /* Binutils emulation layer.

-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2019 Free Software Foundation, Inc.

    Written by Tom Rix, Red Hat Inc.
 
    This file is part of GNU Binutils.
    Written by Tom Rix, Red Hat Inc.
 
    This file is part of GNU Binutils.


@@ -50,17 +50,17 @@ ar_emul_aix_usage (FILE *fp)
 static bfd_boolean
 check_aix (bfd *try_bfd)
 {
 static bfd_boolean
 check_aix (bfd *try_bfd)
 {

-  extern const bfd_target rs6000coff_vec;
-  extern const bfd_target rs6000coff64_vec;
-  extern const bfd_target aix5coff64_vec;
+  extern const bfd_target rs6000_xcoff_vec;
+  extern const bfd_target rs6000_xcoff64_vec;
+  extern const bfd_target rs6000_xcoff64_aix_vec;

 
   if (bfd_check_format (try_bfd, bfd_object))
     {
 
   if (bfd_check_format (try_bfd, bfd_object))
     {

-      if (!X32 && try_bfd->xvec == &rs6000coff_vec)
+      if (!X32 && try_bfd->xvec == &rs6000_xcoff_vec)

        return FALSE;
 
        return FALSE;
 

-      if (!X64 && (try_bfd->xvec == &rs6000coff64_vec
-                  || try_bfd->xvec == &aix5coff64_vec))
+      if (!X64 && (try_bfd->xvec == &rs6000_xcoff64_vec
+                  || try_bfd->xvec == &rs6000_xcoff64_aix_vec))

        return FALSE;
     }
   return TRUE;
        return FALSE;
     }
   return TRUE;