Properly warn relocation in readonly section in a shared object.

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

diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 952e659c41f174278efb5af1b1b950664a29a750..c4f41c50c2c7ee18c3e723a0b0375d0a55f5f997 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, 2010, 2011

    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,6 +24,35 @@
 #include "bfd.h"
 #include "libbfd.h"
 
 #include "bfd.h"
 #include "libbfd.h"
 

+static const bfd_arch_info_type *
+bfd_i386_compatible (const bfd_arch_info_type *a,
+                    const bfd_arch_info_type *b)
+{
+  const bfd_arch_info_type *compat = bfd_default_compatible (a, b);
+
+  /* Don't allow mixing x64_32 with x86_64.  */
+  if (compat && a->bits_per_address != b->bits_per_address)
+    compat = NULL;
+
+  return compat;
+}
+
+static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax =
+{
+  64, /* 64 bits in a word */
+  32, /* 32 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x64_32_intel_syntax,
+  "i386:intel",
+  "i386:x64-32:intel",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  0
+};
+

 static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
 {
   64, /* 64 bits in a word */
 static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
 {
   64, /* 64 bits in a word */


@@ -34,9 +64,9 @@ static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   "i386:x86-64:intel",
   3,
   FALSE,
   "i386:x86-64:intel",
   3,
   FALSE,

-  bfd_default_compatible,
+  bfd_i386_compatible,

   bfd_default_scan,
   bfd_default_scan,

-  0
+  &bfd_x64_32_arch_intel_syntax,

 };
 
 static const bfd_arch_info_type bfd_i386_arch_intel_syntax =
 };
 
 static const bfd_arch_info_type bfd_i386_arch_intel_syntax =


@@ -50,7 +80,7 @@ static const bfd_arch_info_type bfd_i386_arch_intel_syntax =
   "i386:intel",
   3,
   TRUE,
   "i386:intel",
   3,
   TRUE,

-  bfd_default_compatible,
+  bfd_i386_compatible,

   bfd_default_scan,
   &bfd_x86_64_arch_intel_syntax
 };
   bfd_default_scan,
   &bfd_x86_64_arch_intel_syntax
 };


@@ -66,15 +96,31 @@ static const bfd_arch_info_type i8086_arch =
   "i8086",
   3,
   FALSE,
   "i8086",
   3,
   FALSE,

-  bfd_default_compatible,
+  bfd_i386_compatible,

   bfd_default_scan,
   &bfd_i386_arch_intel_syntax
 };
 
   bfd_default_scan,
   &bfd_i386_arch_intel_syntax
 };
 

+static const bfd_arch_info_type bfd_x64_32_arch =
+{
+  64, /* 64 bits in a word */
+  32, /* 32 bits in an address */
+  8,  /* 8 bits in a byte */
+  bfd_arch_i386,
+  bfd_mach_x64_32,
+  "i386",
+  "i386:x64-32",
+  3,
+  FALSE,
+  bfd_i386_compatible,
+  bfd_default_scan,
+  &i8086_arch
+};
+

 static 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,


@@ -82,9 +128,9 @@ static const bfd_arch_info_type bfd_x86_64_arch =
   "i386:x86-64",
   3,
   FALSE,
   "i386:x86-64",
   3,
   FALSE,

-  bfd_default_compatible,
+  bfd_i386_compatible,

   bfd_default_scan,
   bfd_default_scan,

-  &i8086_arch
+  &bfd_x64_32_arch

 };
 
 const bfd_arch_info_type bfd_i386_arch =
 };
 
 const bfd_arch_info_type bfd_i386_arch =


@@ -98,7 +144,7 @@ const bfd_arch_info_type bfd_i386_arch =
   "i386",
   3,
   TRUE,
   "i386",
   3,
   TRUE,

-  bfd_default_compatible,
+  bfd_i386_compatible,

   bfd_default_scan,
   &bfd_x86_64_arch
 };
   bfd_default_scan,
   &bfd_x86_64_arch
 };