or1k: Add the l.adrp insn and supporting relocations

[deliverable/binutils-gdb.git] / bfd / elfxx-x86.c

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 2d8f7b640b5b16be9e71c7e300402f4f22f05cc8..fc99b28c07c650c3685f8b826ab77b4f092c619c 100644 (file)
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2361,33 +2361,29 @@ _bfd_x86_elf_parse_gnu_properties (bfd *abfd, unsigned int type,
 {
   elf_property *prop;
 
-  switch (type)
+  if (type == GNU_PROPERTY_X86_COMPAT_ISA_1_USED
+      || type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+      || (type >= GNU_PROPERTY_X86_UINT32_AND_LO
+         && type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+      || (type >= GNU_PROPERTY_X86_UINT32_OR_LO
+         && type <= GNU_PROPERTY_X86_UINT32_OR_HI)
+      || (type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO
+         && type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI))
     {
-    case GNU_PROPERTY_X86_ISA_1_USED:
-    case GNU_PROPERTY_X86_ISA_1_NEEDED:
-    case GNU_PROPERTY_X86_FEATURE_1_AND:
       if (datasz != 4)
        {
          _bfd_error_handler
-           ((type == GNU_PROPERTY_X86_ISA_1_USED
-             ? _("error: %pB: <corrupt x86 ISA used size: 0x%x>")
-             : (type == GNU_PROPERTY_X86_ISA_1_NEEDED
-                ? _("error: %pB: <corrupt x86 ISA needed size: 0x%x>")
-                : _("error: %pB: <corrupt x86 feature size: 0x%x>"))),
-            abfd, datasz);
+           (_("error: %pB: <corrupt x86 property (0x%x) size: 0x%x>"),
+            abfd, type, datasz);
          return property_corrupt;
        }
       prop = _bfd_elf_get_property (abfd, type, datasz);
-      /* Combine properties of the same type.  */
       prop->u.number |= bfd_h_get_32 (abfd, ptr);
       prop->pr_kind = property_number;
-      break;
-
-    default:
-      return property_ignored;
+      return property_number;
     }
 
-  return property_number;
+  return property_ignored;
 }
 
 /* Merge x86 GNU property BPROP with APROP.  If APROP isn't NULL,
@@ -2404,9 +2400,10 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
   bfd_boolean updated = FALSE;
   unsigned int pr_type = aprop != NULL ? aprop->pr_type : bprop->pr_type;
 
-  switch (pr_type)
+  if (pr_type == GNU_PROPERTY_X86_COMPAT_ISA_1_USED
+      || (pr_type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO
+         && pr_type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI))
     {
-    case GNU_PROPERTY_X86_ISA_1_USED:
       if (aprop == NULL || bprop == NULL)
        {
          /* Only one of APROP and BPROP can be NULL.  */
@@ -2417,11 +2414,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
              aprop->pr_kind = property_remove;
              updated = TRUE;
            }
-         break;
+         return updated;
        }
       goto or_property;
-
-    case GNU_PROPERTY_X86_ISA_1_NEEDED:
+    }
+  else if (pr_type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+          || (pr_type >= GNU_PROPERTY_X86_UINT32_OR_LO
+              && pr_type <= GNU_PROPERTY_X86_UINT32_OR_HI))
+    {
       if (aprop != NULL && bprop != NULL)
        {
 or_property:
@@ -2456,9 +2456,11 @@ or_property:
              updated = bprop->u.number != 0;
            }
        }
-      break;
-
-    case GNU_PROPERTY_X86_FEATURE_1_AND:
+      return updated;
+    }
+  else if (pr_type >= GNU_PROPERTY_X86_UINT32_AND_LO
+          && pr_type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+    {
       /* Only one of APROP and BPROP can be NULL:
         1. APROP & BPROP when both APROP and BPROP aren't NULL.
         2. If APROP is NULL, remove x86 feature.
@@ -2509,9 +2511,10 @@ or_property:
              updated = TRUE;
            }
        }
-      break;
-
-    default:
+      return updated;
+    }
+  else
+    {
       /* Never should happen.  */
       abort ();
     }
@@ -2596,27 +2599,30 @@ _bfd_x86_elf_link_setup_gnu_properties
        {
          /* If the separate code program header is needed, make sure
             that the first read-only PT_LOAD segment has no code by
-            adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+            adding a GNU_PROPERTY_X86_FEATURE_2_NEEDED note.  */
          elf_property_list *list;
          bfd_boolean need_property = TRUE;
 
          for (list = elf_properties (ebfd); list; list = list->next)
-           switch (list->property.pr_type)
-             {
-             case GNU_PROPERTY_STACK_SIZE:
-             case GNU_PROPERTY_NO_COPY_ON_PROTECTED:
-             case GNU_PROPERTY_X86_ISA_1_NEEDED:
-               /* These properties won't be removed during merging.  */
-               need_property = FALSE;
-               break;
-             }
+           {
+             unsigned int pr_type = list->property.pr_type;
+             if (pr_type == GNU_PROPERTY_STACK_SIZE
+                 || pr_type == GNU_PROPERTY_NO_COPY_ON_PROTECTED
+                 || pr_type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+                 || (pr_type >= GNU_PROPERTY_X86_UINT32_OR_LO
+                     && pr_type <= GNU_PROPERTY_X86_UINT32_OR_HI))
+               {
+                 /* These properties won't be removed during merging.  */
+                 need_property = FALSE;
+                 break;
+               }
+           }
 
          if (need_property)
            {
-             prop = _bfd_elf_get_property (ebfd,
-                                           GNU_PROPERTY_X86_ISA_1_NEEDED,
-                                           4);
-             prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+             prop = _bfd_elf_get_property
+               (ebfd, GNU_PROPERTY_X86_FEATURE_2_NEEDED, 4);
+             prop->u.number = GNU_PROPERTY_X86_FEATURE_2_X86;
              prop->pr_kind = property_number;
            }
        }
@@ -2959,3 +2965,45 @@ error_alignment:
 
   return pbfd;
 }
+
+/* Fix up x86 GNU properties.  */
+
+void
+_bfd_x86_elf_link_fixup_gnu_properties (struct bfd_link_info *info,
+                                       elf_property_list **listp)
+{
+  elf_property_list *p;
+
+  for (p = *listp; p; p = p->next)
+    {
+      unsigned int type = p->property.pr_type;
+      if (type == GNU_PROPERTY_X86_COMPAT_ISA_1_USED
+         || type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED
+         || (type >= GNU_PROPERTY_X86_UINT32_AND_LO
+             && type <= GNU_PROPERTY_X86_UINT32_AND_HI)
+         || (type >= GNU_PROPERTY_X86_UINT32_OR_LO
+             && type <= GNU_PROPERTY_X86_UINT32_OR_HI)
+         || (type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO
+             && type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI))
+       {
+         if (p->property.u.number == 0)
+           {
+             /* Remove empty property.  */
+             *listp = p->next;
+             continue;
+           }
+
+         /* Mark x86-specific properties with X86_UINT32_VALID for
+            non-relocatable output.  */
+         if (!bfd_link_relocatable (info))
+           p->property.u.number |= GNU_PROPERTY_X86_UINT32_VALID;
+
+         listp = &p->next;
+       }
+      else if (type > GNU_PROPERTY_HIPROC)
+       {
+         /* The property list is sorted in order of type.  */
+         break;
+       }
+    }
+}