X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fmach-o-x86-64.c;h=9a6b58bc271f6139ab12c95acc9e4a36aafd79bc;hb=c3bf7d31de6b0c693c1c873ce3c36bc8c43ca06a;hp=2c5047616c4f87217f4317d51329b7df9d5ebd18;hpb=ca4cf9b9c622a5695e01f7f5815a7382a31fcf51;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/mach-o-x86-64.c b/bfd/mach-o-x86-64.c
index 2c5047616c..9a6b58bc27 100644
--- a/bfd/mach-o-x86-64.c
+++ b/bfd/mach-o-x86-64.c
@@ -1,5 +1,5 @@
 /* Intel x86-64 Mach-O support for BFD.
-   Copyright (C) 2010-2017 Free Software Foundation, Inc.
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -19,27 +19,27 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "mach-o.h"
 #include "bfd.h"
 #include "libbfd.h"
 #include "libiberty.h"
+#include "mach-o.h"
 #include "mach-o/x86-64.h"
 
 #define bfd_mach_o_object_p bfd_mach_o_x86_64_object_p
 #define bfd_mach_o_core_p bfd_mach_o_x86_64_core_p
 #define bfd_mach_o_mkobject bfd_mach_o_x86_64_mkobject
 
-static const bfd_target *
+static bfd_cleanup
 bfd_mach_o_x86_64_object_p (bfd *abfd)
 {
   return bfd_mach_o_header_p (abfd, 0, 0, BFD_MACH_O_CPU_TYPE_X86_64);
 }
 
-static const bfd_target *
+static bfd_cleanup
 bfd_mach_o_x86_64_core_p (bfd *abfd)
 {
   return bfd_mach_o_header_p (abfd, 0,
-                              BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_X86_64);
+			      BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_X86_64);
 }
 
 static bfd_boolean
@@ -117,6 +117,11 @@ static reloc_howto_type x86_64_howto_table[]=
 	complain_overflow_bitfield,
 	NULL, "BRANCH8",
 	FALSE, 0xff, 0xff, TRUE),
+  /* 12 */
+  HOWTO(BFD_RELOC_MACH_O_X86_64_TLV, 0, 2, 32, TRUE, 0,
+	complain_overflow_bitfield,
+	NULL, "TLV",
+	FALSE, 0xffffffff, 0xffffffff, TRUE),
 };
 
 static bfd_boolean
@@ -139,86 +144,93 @@ bfd_mach_o_x86_64_canonicalize_one_reloc (bfd *       abfd,
     {
     case BFD_MACH_O_X86_64_RELOC_UNSIGNED:
       if (reloc.r_pcrel)
-        return FALSE;
+	return FALSE;
       switch (reloc.r_length)
-        {
-        case 2:
-          res->howto = &x86_64_howto_table[1];
-          return TRUE;
-        case 3:
-          res->howto = &x86_64_howto_table[0];
-          return TRUE;
-        default:
-          return FALSE;
-        }
+	{
+	case 2:
+	  res->howto = &x86_64_howto_table[1];
+	  return TRUE;
+	case 3:
+	  res->howto = &x86_64_howto_table[0];
+	  return TRUE;
+	default:
+	  return FALSE;
+	}
     case BFD_MACH_O_X86_64_RELOC_SIGNED:
       if (reloc.r_length == 2 && reloc.r_pcrel)
-        {
-          res->howto = &x86_64_howto_table[2];
-          return TRUE;
-        }
+	{
+	  res->howto = &x86_64_howto_table[2];
+	  return TRUE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_BRANCH:
       if (!reloc.r_pcrel)
-        return FALSE;
+	return FALSE;
       switch (reloc.r_length)
-        {
-        case 2:
-          res->howto = &x86_64_howto_table[6];
-          return TRUE;
-        default:
-          return FALSE;
-        }
+	{
+	case 2:
+	  res->howto = &x86_64_howto_table[6];
+	  return TRUE;
+	default:
+	  return FALSE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_GOT_LOAD:
       if (reloc.r_length == 2 && reloc.r_pcrel && reloc.r_extern)
-        {
-          res->howto = &x86_64_howto_table[7];
-          return TRUE;
-        }
+	{
+	  res->howto = &x86_64_howto_table[7];
+	  return TRUE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_GOT:
       if (reloc.r_length == 2 && reloc.r_pcrel && reloc.r_extern)
-        {
-          res->howto = &x86_64_howto_table[10];
-          return TRUE;
-        }
+	{
+	  res->howto = &x86_64_howto_table[10];
+	  return TRUE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_SUBTRACTOR:
       if (reloc.r_pcrel)
-        return FALSE;
+	return FALSE;
       switch (reloc.r_length)
-        {
-        case 2:
-          res->howto = &x86_64_howto_table[8];
-          return TRUE;
-        case 3:
-          res->howto = &x86_64_howto_table[9];
-          return TRUE;
-        default:
-          return FALSE;
-        }
+	{
+	case 2:
+	  res->howto = &x86_64_howto_table[8];
+	  return TRUE;
+	case 3:
+	  res->howto = &x86_64_howto_table[9];
+	  return TRUE;
+	default:
+	  return FALSE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_SIGNED_1:
       if (reloc.r_length == 2 && reloc.r_pcrel)
-        {
-          res->howto = &x86_64_howto_table[3];
-          return TRUE;
-        }
+	{
+	  res->howto = &x86_64_howto_table[3];
+	  return TRUE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_SIGNED_2:
       if (reloc.r_length == 2 && reloc.r_pcrel)
-        {
-          res->howto = &x86_64_howto_table[4];
-          return TRUE;
-        }
+	{
+	  res->howto = &x86_64_howto_table[4];
+	  return TRUE;
+	}
       break;
     case BFD_MACH_O_X86_64_RELOC_SIGNED_4:
       if (reloc.r_length == 2 && reloc.r_pcrel)
-        {
-          res->howto = &x86_64_howto_table[5];
-          return TRUE;
-        }
+	{
+	  res->howto = &x86_64_howto_table[5];
+	  return TRUE;
+	}
+      break;
+    case BFD_MACH_O_X86_64_RELOC_TLV:
+      if (reloc.r_length == 2 && reloc.r_pcrel && reloc.r_extern)
+	{
+	  res->howto = &x86_64_howto_table[12];
+	  return TRUE;
+	}
       break;
     default:
       return FALSE;
@@ -288,6 +300,11 @@ bfd_mach_o_x86_64_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo)
       rinfo->r_pcrel = 1;
       rinfo->r_length = 2;
       break;
+    case BFD_RELOC_MACH_O_X86_64_TLV:
+      rinfo->r_type = BFD_MACH_O_X86_64_RELOC_TLV;
+      rinfo->r_pcrel = 1;
+      rinfo->r_length = 2;
+      break;
     default:
       return FALSE;
     }
@@ -307,7 +324,7 @@ bfd_mach_o_x86_64_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo)
 
 static reloc_howto_type *
 bfd_mach_o_x86_64_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-                                         bfd_reloc_code_real_type code)
+					 bfd_reloc_code_real_type code)
 {
   unsigned int i;
 
@@ -321,7 +338,7 @@ bfd_mach_o_x86_64_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 
 static reloc_howto_type *
 bfd_mach_o_x86_64_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-                                         const char *name ATTRIBUTE_UNUSED)
+					 const char *name ATTRIBUTE_UNUSED)
 {
   return NULL;
 }
@@ -362,11 +379,11 @@ const mach_o_segment_name_xlat mach_o_x86_64_segsec_names_xlat[] =
 #define bfd_mach_o_tgt_seg_table mach_o_x86_64_segsec_names_xlat
 #define bfd_mach_o_section_type_valid_for_tgt bfd_mach_o_section_type_valid_for_x86_64
 
-#define TARGET_NAME 		x86_64_mach_o_vec
-#define TARGET_STRING 		"mach-o-x86-64"
+#define TARGET_NAME		x86_64_mach_o_vec
+#define TARGET_STRING		"mach-o-x86-64"
 #define TARGET_ARCHITECTURE	bfd_arch_i386
 #define TARGET_PAGESIZE		4096
-#define TARGET_BIG_ENDIAN 	0
-#define TARGET_ARCHIVE 		0
+#define TARGET_BIG_ENDIAN	0
+#define TARGET_ARCHIVE		0
 #define TARGET_PRIORITY		0
 #include "mach-o-target.c"