Merge commit 'upstream/2.20'

[msp430-binutils.git] / bfd / cpu-i386.c

diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 4001a05a4226a73ee7ce8d2a69baa4afe1219771..44cca9da8ce0ae732be7c4a527e81822cb46488c 100644 (file)
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -1,5 +1,6 @@
 /* BFD support for the Intel 386 architecture.
 /* BFD support for the Intel 386 architecture.

-   Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2004, 2007
+   Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2004, 2005,
+   2007, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -23,7 +24,7 @@
 #include "bfd.h"
 #include "libbfd.h"
 
 #include "bfd.h"
 #include "libbfd.h"
 

-const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
+static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =

 {
   64, /* 64 bits in a word */
   64, /* 64 bits in an address */
 {
   64, /* 64 bits in a word */
   64, /* 64 bits in an address */


@@ -39,7 +40,7 @@ const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   0
 };
 
   0
 };
 

-const bfd_arch_info_type bfd_i386_arch_intel_syntax =
+static const bfd_arch_info_type bfd_i386_arch_intel_syntax =

 {
   32,  /* 32 bits in a word */
   32,  /* 32 bits in an address */
 {
   32,  /* 32 bits in a word */
   32,  /* 32 bits in an address */


@@ -55,7 +56,7 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   &bfd_x86_64_arch_intel_syntax
 };
 
   &bfd_x86_64_arch_intel_syntax
 };
 

-const bfd_arch_info_type i8086_arch =
+static const bfd_arch_info_type i8086_arch =

 {
   32,  /* 32 bits in a word */
   32,  /* 32 bits in an address (well, not really) */
 {
   32,  /* 32 bits in a word */
   32,  /* 32 bits in an address (well, not really) */


@@ -71,10 +72,10 @@ const bfd_arch_info_type i8086_arch =
   &bfd_i386_arch_intel_syntax
 };
 
   &bfd_i386_arch_intel_syntax
 };
 

-const bfd_arch_info_type bfd_x86_64_arch =
+static const bfd_arch_info_type bfd_x86_64_arch =

 {
 {

-  64, /* 32 bits in a word */
-  64, /* 32 bits in an address */
+  64, /* 64 bits in a word */
+  64, /* 64 bits in an address */

   8,  /* 8 bits in a byte */
   bfd_arch_i386,
   bfd_mach_x86_64,
   8,  /* 8 bits in a byte */
   bfd_arch_i386,
   bfd_mach_x86_64,