66b412
diff -rup binutils.orig/bfd/elfnn-aarch64.c binutils-2.32/bfd/elfnn-aarch64.c
66b412
--- binutils.orig/bfd/elfnn-aarch64.c	2019-07-02 17:30:19.407892712 +0100
66b412
+++ binutils-2.32/bfd/elfnn-aarch64.c	2019-07-02 17:35:21.874749884 +0100
66b412
@@ -2579,6 +2579,9 @@ struct elf_aarch64_link_hash_table
66b412
   unsigned int top_index;
66b412
   asection **input_list;
66b412
 
66b412
+  /* JUMP_SLOT relocs for variant PCS symbols may be present.  */
66b412
+  int variant_pcs;
66b412
+
66b412
   /* The offset into splt of the PLT entry for the TLS descriptor
66b412
      resolver.  Special values are 0, if not necessary (or not found
66b412
      to be necessary yet), and -1 if needed but not determined
66b412
@@ -2790,6 +2793,31 @@ elfNN_aarch64_copy_indirect_symbol (stru
66b412
   _bfd_elf_link_hash_copy_indirect (info, dir, ind);
66b412
 }
66b412
 
66b412
+/* Merge non-visibility st_other attributes.  */
66b412
+
66b412
+static void
66b412
+elfNN_aarch64_merge_symbol_attribute (struct elf_link_hash_entry *h,
66b412
+				      const Elf_Internal_Sym *isym,
66b412
+				      bfd_boolean definition ATTRIBUTE_UNUSED,
66b412
+				      bfd_boolean dynamic ATTRIBUTE_UNUSED)
66b412
+{
66b412
+  unsigned int isym_sto = isym->st_other & ~ELF_ST_VISIBILITY (-1);
66b412
+  unsigned int h_sto = h->other & ~ELF_ST_VISIBILITY (-1);
66b412
+
66b412
+  if (isym_sto == h_sto)
66b412
+    return;
66b412
+
66b412
+  if (isym_sto & ~STO_AARCH64_VARIANT_PCS)
66b412
+    /* Not fatal, this callback cannot fail.  */
66b412
+    _bfd_error_handler (_("unknown attribute for symbol `%s': 0x%02x"),
66b412
+			h->root.root.string, isym_sto);
66b412
+
66b412
+  /* Note: Ideally we would warn about any attribute mismatch, but
66b412
+     this api does not allow that without substantial changes.  */
66b412
+  if (isym_sto & STO_AARCH64_VARIANT_PCS)
66b412
+    h->other |= STO_AARCH64_VARIANT_PCS;
66b412
+}
66b412
+
66b412
 /* Destroy an AArch64 elf linker hash table.  */
66b412
 
66b412
 static void
66b412
@@ -8370,6 +8398,12 @@ elfNN_aarch64_allocate_dynrelocs (struct
66b412
 	     updated.  */
66b412
 
66b412
 	  htab->root.srelplt->reloc_count++;
66b412
+
66b412
+	  /* Mark the DSO in case R_<CLS>_JUMP_SLOT relocs against
66b412
+	     variant PCS symbols are present.  */
66b412
+	  if (h->other & STO_AARCH64_VARIANT_PCS)
66b412
+	    htab->variant_pcs = 1;
66b412
+
66b412
 	}
66b412
       else
66b412
 	{
66b412
@@ -8958,6 +8992,10 @@ elfNN_aarch64_size_dynamic_sections (bfd
66b412
 	      || !add_dynamic_entry (DT_JMPREL, 0))
66b412
 	    return FALSE;
66b412
 
66b412
+	  if (htab->variant_pcs
66b412
+	      && !add_dynamic_entry (DT_AARCH64_VARIANT_PCS, 0))
66b412
+	    return FALSE;
66b412
+
66b412
 	  if (htab->tlsdesc_plt
66b412
 	      && (!add_dynamic_entry (DT_TLSDESC_PLT, 0)
66b412
 		  || !add_dynamic_entry (DT_TLSDESC_GOT, 0)))
66b412
@@ -9708,6 +9746,9 @@ const struct elf_size_info elfNN_aarch64
66b412
 #define elf_backend_copy_indirect_symbol	\
66b412
   elfNN_aarch64_copy_indirect_symbol
66b412
 
66b412
+#define elf_backend_merge_symbol_attribute	\
66b412
+  elfNN_aarch64_merge_symbol_attribute
66b412
+
66b412
 /* Create .dynbss, and .rela.bss sections in DYNOBJ, and set up shortcuts
66b412
    to them in our hash.  */
66b412
 #define elf_backend_create_dynamic_sections	\
66b412
diff -rup binutils.orig/binutils/readelf.c binutils-2.32/binutils/readelf.c
66b412
--- binutils.orig/binutils/readelf.c	2019-07-02 17:30:18.890896375 +0100
66b412
+++ binutils-2.32/binutils/readelf.c	2019-07-02 17:32:25.008002901 +0100
66b412
@@ -1797,6 +1797,19 @@ dump_relocations (Filedata *          fi
66b412
 }
66b412
 
66b412
 static const char *
66b412
+get_aarch64_dynamic_type (unsigned long type)
66b412
+{
66b412
+  switch (type)
66b412
+    {
66b412
+    case DT_AARCH64_BTI_PLT:  return "AARCH64_BTI_PLT";
66b412
+    case DT_AARCH64_PAC_PLT:  return "AARCH64_PAC_PLT";
66b412
+    case DT_AARCH64_VARIANT_PCS:  return "AARCH64_VARIANT_PCS";
66b412
+    default:
66b412
+      return NULL;
66b412
+    }
66b412
+}
66b412
+
66b412
+static const char *
66b412
 get_mips_dynamic_type (unsigned long type)
66b412
 {
66b412
   switch (type)
66b412
@@ -2169,6 +2182,9 @@ get_dynamic_type (Filedata * filedata, u
66b412
 
66b412
 	  switch (filedata->file_header.e_machine)
66b412
 	    {
66b412
+	    case EM_AARCH64:
66b412
+	      result = get_aarch64_dynamic_type (type);
66b412
+	      break;
66b412
 	    case EM_MIPS:
66b412
 	    case EM_MIPS_RS3_LE:
66b412
 	      result = get_mips_dynamic_type (type);
66b412
@@ -11054,6 +11070,22 @@ get_solaris_symbol_visibility (unsigned
66b412
 }
66b412
 
66b412
 static const char *
66b412
+get_aarch64_symbol_other (unsigned int other)
66b412
+{
66b412
+  static char buf[32];
66b412
+
66b412
+  if (other & STO_AARCH64_VARIANT_PCS)
66b412
+    {
66b412
+      other &= ~STO_AARCH64_VARIANT_PCS;
66b412
+      if (other == 0)
66b412
+	return "VARIANT_PCS";
66b412
+      snprintf (buf, sizeof buf, "VARIANT_PCS | %x", other);
66b412
+      return buf;
66b412
+    }
66b412
+  return NULL;
66b412
+}
66b412
+
66b412
+static const char *
66b412
 get_mips_symbol_other (unsigned int other)
66b412
 {
66b412
   switch (other)
66b412
@@ -11164,6 +11196,9 @@ get_symbol_other (Filedata * filedata, u
66b412
 
66b412
   switch (filedata->file_header.e_machine)
66b412
     {
66b412
+    case EM_AARCH64:
66b412
+      result = get_aarch64_symbol_other (other);
66b412
+      break;
66b412
     case EM_MIPS:
66b412
       result = get_mips_symbol_other (other);
66b412
       break;
66b412
diff -rup binutils.orig/gas/config/tc-aarch64.c binutils-2.32/gas/config/tc-aarch64.c
66b412
--- binutils.orig/gas/config/tc-aarch64.c	2019-07-02 17:30:19.131894667 +0100
66b412
+++ binutils-2.32/gas/config/tc-aarch64.c	2019-07-02 17:35:45.202584620 +0100
66b412
@@ -1938,6 +1938,28 @@ s_aarch64_elf_cons (int nbytes)
66b412
   demand_empty_rest_of_line ();
66b412
 }
66b412
 
66b412
+/* Mark symbol that it follows a variant PCS convention.  */
66b412
+
66b412
+static void
66b412
+s_variant_pcs (int ignored ATTRIBUTE_UNUSED)
66b412
+{
66b412
+  char *name;
66b412
+  char c;
66b412
+  symbolS *sym;
66b412
+  asymbol *bfdsym;
66b412
+  elf_symbol_type *elfsym;
66b412
+
66b412
+  c = get_symbol_name (&name);
66b412
+  if (!*name)
66b412
+    as_bad (_("Missing symbol name in directive"));
66b412
+  sym = symbol_find_or_make (name);
66b412
+  restore_line_pointer (c);
66b412
+  demand_empty_rest_of_line ();
66b412
+  bfdsym = symbol_get_bfdsym (sym);
66b412
+  elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym);
66b412
+  gas_assert (elfsym);
66b412
+  elfsym->internal_elf_sym.st_other |= STO_AARCH64_VARIANT_PCS;
66b412
+}
66b412
 #endif /* OBJ_ELF */
66b412
 
66b412
 /* Output a 32-bit word, but mark as an instruction.  */
66b412
@@ -2084,6 +2106,7 @@ const pseudo_typeS md_pseudo_table[] = {
66b412
   {"long", s_aarch64_elf_cons, 4},
66b412
   {"xword", s_aarch64_elf_cons, 8},
66b412
   {"dword", s_aarch64_elf_cons, 8},
66b412
+  {"variant_pcs", s_variant_pcs, 0},
66b412
 #endif
66b412
   {0, 0, 0}
66b412
 };
66b412
@@ -9320,3 +9343,35 @@ aarch64_copy_symbol_attributes (symbolS
66b412
 {
66b412
   AARCH64_GET_FLAG (dest) = AARCH64_GET_FLAG (src);
66b412
 }
66b412
+
66b412
+#ifdef OBJ_ELF
66b412
+/* Same as elf_copy_symbol_attributes, but without copying st_other.
66b412
+   This is needed so AArch64 specific st_other values can be independently
66b412
+   specified for an IFUNC resolver (that is called by the dynamic linker)
66b412
+   and the symbol it resolves (aliased to the resolver).  In particular,
66b412
+   if a function symbol has special st_other value set via directives,
66b412
+   then attaching an IFUNC resolver to that symbol should not override
66b412
+   the st_other setting.  Requiring the directive on the IFUNC resolver
66b412
+   symbol would be unexpected and problematic in C code, where the two
66b412
+   symbols appear as two independent function declarations.  */
66b412
+
66b412
+void
66b412
+aarch64_elf_copy_symbol_attributes (symbolS *dest, symbolS *src)
66b412
+{
66b412
+  struct elf_obj_sy *srcelf = symbol_get_obj (src);
66b412
+  struct elf_obj_sy *destelf = symbol_get_obj (dest);
66b412
+  if (srcelf->size)
66b412
+    {
66b412
+      if (destelf->size == NULL)
66b412
+	destelf->size = XNEW (expressionS);
66b412
+      *destelf->size = *srcelf->size;
66b412
+    }
66b412
+  else
66b412
+    {
66b412
+      if (destelf->size != NULL)
66b412
+	free (destelf->size);
66b412
+      destelf->size = NULL;
66b412
+    }
66b412
+  S_SET_SIZE (dest, S_GET_SIZE (src));
66b412
+}
66b412
+#endif
66b412
diff -rup binutils.orig/gas/config/tc-aarch64.h binutils-2.32/gas/config/tc-aarch64.h
66b412
--- binutils.orig/gas/config/tc-aarch64.h	2019-07-02 17:30:19.136894632 +0100
66b412
+++ binutils-2.32/gas/config/tc-aarch64.h	2019-07-02 17:35:45.202584620 +0100
66b412
@@ -130,6 +130,12 @@ void aarch64_copy_symbol_attributes (sym
66b412
   (aarch64_copy_symbol_attributes (DEST, SRC))
66b412
 #endif
66b412
 
66b412
+#ifdef OBJ_ELF
66b412
+void aarch64_elf_copy_symbol_attributes (symbolS *, symbolS *);
66b412
+#define OBJ_COPY_SYMBOL_ATTRIBUTES(DEST, SRC) \
66b412
+  aarch64_elf_copy_symbol_attributes (DEST, SRC)
66b412
+#endif
66b412
+
66b412
 #define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR)			\
66b412
   (NEXT_CHAR == ':' || (NEXT_CHAR == '/' && aarch64_data_in_code ()))
66b412
 #define tc_canonicalize_symbol_name(str) aarch64_canonicalize_symbol_name (str);
66b412
diff -rup binutils.orig/gas/doc/c-aarch64.texi binutils-2.32/gas/doc/c-aarch64.texi
66b412
--- binutils.orig/gas/doc/c-aarch64.texi	2019-07-02 17:30:19.125894710 +0100
66b412
+++ binutils-2.32/gas/doc/c-aarch64.texi	2019-07-02 17:35:11.362824354 +0100
66b412
@@ -425,6 +425,12 @@ should only be done if it is really nece
66b412
 
66b412
 @c VVVVVVVVVVVVVVVVVVVVVVVVVV
66b412
 
66b412
+@cindex @code{.variant_pcs} directive, AArch64
66b412
+@item .variant_pcs @var{symbol}
66b412
+This directive marks @var{symbol} referencing a function that may
66b412
+follow a variant procedure call standard with different register
66b412
+usage convention from the base procedure call standard.
66b412
+
66b412
 @c WWWWWWWWWWWWWWWWWWWWWWWWWW
66b412
 @c XXXXXXXXXXXXXXXXXXXXXXXXXX
66b412
 
66b412
diff -rup binutils.orig/include/elf/aarch64.h binutils-2.32/include/elf/aarch64.h
66b412
--- binutils.orig/include/elf/aarch64.h	2019-07-02 17:30:18.850896658 +0100
66b412
+++ binutils-2.32/include/elf/aarch64.h	2019-07-02 17:32:55.678785616 +0100
66b412
@@ -36,6 +36,15 @@
66b412
 #define SHF_COMDEF		0x80000000   /* Section may be multiply defined
66b412
 						in the input to a link step.  */
66b412
 
66b412
+/* Processor specific dynamic array tags.  */
66b412
+#define DT_AARCH64_BTI_PLT	(DT_LOPROC + 1)
66b412
+#define DT_AARCH64_PAC_PLT	(DT_LOPROC + 3)
66b412
+#define DT_AARCH64_VARIANT_PCS	(DT_LOPROC + 5)
66b412
+
66b412
+/* AArch64-specific values for st_other.  */
66b412
+#define STO_AARCH64_VARIANT_PCS	0x80  /* Symbol may follow different call
66b412
+					 convention from the base PCS.  */
66b412
+
66b412
 /* Relocation types.  */
66b412
 
66b412
 START_RELOC_NUMBERS (elf_aarch64_reloc_type)
66b412
diff -rup binutils.orig/ld/testsuite/ld-aarch64/aarch64-elf.exp binutils-2.32/ld/testsuite/ld-aarch64/aarch64-elf.exp
66b412
--- binutils.orig/ld/testsuite/ld-aarch64/aarch64-elf.exp	2019-07-02 17:30:18.922896148 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/aarch64-elf.exp	2019-07-02 17:35:21.875749878 +0100
66b412
@@ -371,6 +371,10 @@ run_dump_test_lp64 "rela-abs-relative-op
66b412
 
66b412
 run_dump_test_lp64 "pie-bind-locally"
66b412
 
66b412
+run_dump_test_lp64 "variant_pcs-r"
66b412
+run_dump_test_lp64 "variant_pcs-shared"
66b412
+run_dump_test_lp64 "variant_pcs-now"
66b412
+
66b412
 set aarch64elflinktests {
66b412
   {"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s}
66b412
     {} "copy-reloc-so.so"}
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.d	2019-07-02 17:35:11.362824354 +0100
66b412
@@ -0,0 +1,10 @@
66b412
+#objdump: -t
66b412
+
66b412
+.*:     file format .*
66b412
+
66b412
+SYMBOL TABLE:
66b412
+0+ l    d  \.text	0+ \.text
66b412
+0+ l    d  \.data	0+ \.data
66b412
+0+ l    d  \.bss	0+ \.bss
66b412
+0+ l       \.text	0+ func
66b412
+0+         \*UND\*	0+ 0x80 foobar
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.s	2019-07-02 17:35:11.362824354 +0100
66b412
@@ -0,0 +1,8 @@
66b412
+.text
66b412
+.variant_pcs foobar
66b412
+func:
66b412
+	bl	foobar
66b412
+	b	foobar
66b412
+
66b412
+.data
66b412
+.xword	foobar
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.d	2019-07-02 17:35:11.362824354 +0100
66b412
@@ -0,0 +1,9 @@
66b412
+#objdump: -t
66b412
+
66b412
+.*:     file format .*
66b412
+
66b412
+SYMBOL TABLE:
66b412
+0+ l    d  \.text	0+ \.text
66b412
+0+ l    d  \.data	0+ \.data
66b412
+0+ l    d  \.bss	0+ \.bss
66b412
+0+ l       \.text	0+ 0x80 foo
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.s	2019-07-02 17:35:11.362824354 +0100
66b412
@@ -0,0 +1,4 @@
66b412
+.text
66b412
+.variant_pcs foo
66b412
+foo:
66b412
+	ret
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.s	2019-07-02 17:35:45.202584620 +0100
66b412
@@ -0,0 +1,20 @@
66b412
+.text
66b412
+.global foo_vpcs
66b412
+.global foo_base
66b412
+.global alias_vpcs
66b412
+.global alias_base
66b412
+
66b412
+.variant_pcs foo_vpcs
66b412
+.variant_pcs alias_vpcs
66b412
+
66b412
+foo_vpcs:
66b412
+foo_base:
66b412
+	bl foo_vpcs
66b412
+	bl foo_base
66b412
+	bl alias_vpcs
66b412
+	bl alias_base
66b412
+
66b412
+/* Check that the STO_AARCH64_VARIANT_PCS is not affected by .set.  */
66b412
+
66b412
+.set alias_base, foo_vpcs
66b412
+.set alias_vpcs, foo_base
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.d	2019-07-02 17:35:45.202584620 +0100
66b412
@@ -0,0 +1,12 @@
66b412
+#objdump: -t
66b412
+
66b412
+.*:     file format .*
66b412
+
66b412
+SYMBOL TABLE:
66b412
+0+ l    d  \.text	0+ \.text
66b412
+0+ l    d  \.data	0+ \.data
66b412
+0+ l    d  \.bss	0+ \.bss
66b412
+0+ g       \.text	0+ 0x80 foo_vpcs
66b412
+0+ g       \.text	0+ foo_base
66b412
+0+ g       \.text	0+ 0x80 alias_vpcs
66b412
+0+ g       \.text	0+ alias_base
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-1.s	2019-07-02 17:35:21.875749878 +0100
66b412
@@ -0,0 +1,59 @@
66b412
+.text
66b412
+
66b412
+.variant_pcs f_spec_global_default_def
66b412
+.variant_pcs f_spec_global_default_undef
66b412
+.variant_pcs f_spec_global_hidden_def
66b412
+.variant_pcs f_spec_local
66b412
+.variant_pcs f_spec_global_default_ifunc
66b412
+.variant_pcs f_spec_global_hidden_ifunc
66b412
+.variant_pcs f_spec_local_ifunc
66b412
+
66b412
+.global f_spec_global_default_def
66b412
+.global f_spec_global_default_undef
66b412
+.global f_spec_global_hidden_def
66b412
+.global f_spec_global_default_ifunc
66b412
+.global f_spec_global_hidden_ifunc
66b412
+.global f_base_global_default_def
66b412
+.global f_base_global_default_undef
66b412
+.global f_base_global_hidden_def
66b412
+.global f_base_global_default_ifunc
66b412
+.global f_base_global_hidden_ifunc
66b412
+
66b412
+.hidden f_spec_global_hidden_def
66b412
+.hidden f_spec_global_hidden_ifunc
66b412
+.hidden f_base_global_hidden_def
66b412
+.hidden f_base_global_hidden_ifunc
66b412
+
66b412
+.type f_spec_global_default_ifunc, %gnu_indirect_function
66b412
+.type f_spec_global_hidden_ifunc, %gnu_indirect_function
66b412
+.type f_spec_local_ifunc, %gnu_indirect_function
66b412
+.type f_base_global_default_ifunc, %gnu_indirect_function
66b412
+.type f_base_global_hidden_ifunc, %gnu_indirect_function
66b412
+.type f_base_local_ifunc, %gnu_indirect_function
66b412
+
66b412
+f_spec_global_default_def:
66b412
+f_spec_global_hidden_def:
66b412
+f_spec_local:
66b412
+f_base_global_default_def:
66b412
+f_base_global_hidden_def:
66b412
+f_base_local:
66b412
+f_spec_global_default_ifunc:
66b412
+f_spec_global_hidden_ifunc:
66b412
+f_spec_local_ifunc:
66b412
+f_base_global_default_ifunc:
66b412
+f_base_global_hidden_ifunc:
66b412
+f_base_local_ifunc:
66b412
+	bl f_spec_global_default_def
66b412
+	bl f_spec_global_default_undef
66b412
+	bl f_spec_global_hidden_def
66b412
+	bl f_spec_local
66b412
+	bl f_base_global_default_def
66b412
+	bl f_base_global_default_undef
66b412
+	bl f_base_global_hidden_def
66b412
+	bl f_base_local
66b412
+	bl f_spec_global_default_ifunc
66b412
+	bl f_spec_global_hidden_ifunc
66b412
+	bl f_spec_local_ifunc
66b412
+	bl f_base_global_default_ifunc
66b412
+	bl f_base_global_hidden_ifunc
66b412
+	bl f_base_local_ifunc
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-2.s	2019-07-02 17:35:21.875749878 +0100
66b412
@@ -0,0 +1,47 @@
66b412
+.text
66b412
+
66b412
+.variant_pcs f_spec_global_default_def
66b412
+.variant_pcs f_spec_global_default_undef
66b412
+.variant_pcs f_spec_global_hidden_def
66b412
+.variant_pcs f_spec_local2
66b412
+.variant_pcs f_spec_global_default_ifunc
66b412
+.variant_pcs f_spec_global_hidden_ifunc
66b412
+.variant_pcs f_spec_local2_ifunc
66b412
+
66b412
+.global f_spec_global_default_def
66b412
+.global f_spec_global_default_undef
66b412
+.global f_spec_global_hidden_def
66b412
+.global f_spec_global_default_ifunc
66b412
+.global f_spec_global_hidden_ifunc
66b412
+.global f_base_global_default_def
66b412
+.global f_base_global_default_undef
66b412
+.global f_base_global_hidden_def
66b412
+.global f_base_global_default_ifunc
66b412
+.global f_base_global_hidden_ifunc
66b412
+
66b412
+.hidden f_spec_global_hidden_def
66b412
+.hidden f_spec_global_hidden_ifunc
66b412
+.hidden f_base_global_hidden_def
66b412
+.hidden f_base_global_hidden_ifunc
66b412
+
66b412
+.type f_spec_local2_ifunc, %gnu_indirect_function
66b412
+.type f_base_local2_ifunc, %gnu_indirect_function
66b412
+
66b412
+f_spec_local2:
66b412
+f_base_local2:
66b412
+f_spec_local2_ifunc:
66b412
+f_base_local2_ifunc:
66b412
+	bl f_spec_global_default_def
66b412
+	bl f_spec_global_default_undef
66b412
+	bl f_spec_global_hidden_def
66b412
+	bl f_spec_local2
66b412
+	bl f_base_global_default_def
66b412
+	bl f_base_global_default_undef
66b412
+	bl f_base_global_hidden_def
66b412
+	bl f_base_local2
66b412
+	bl f_spec_global_default_ifunc
66b412
+	bl f_spec_global_hidden_ifunc
66b412
+	bl f_spec_local2_ifunc
66b412
+	bl f_base_global_default_ifunc
66b412
+	bl f_base_global_hidden_ifunc
66b412
+	bl f_base_local2_ifunc
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs.ld	2019-07-02 17:35:37.100642017 +0100
66b412
@@ -0,0 +1,23 @@
66b412
+/* Script for .variant_pcs symbol tests.  */
66b412
+OUTPUT_ARCH(aarch64)
66b412
+ENTRY(_start)
66b412
+SECTIONS
66b412
+{
66b412
+  /* Read-only sections, merged into text segment: */
66b412
+  PROVIDE (__executable_start = 0x8000); . = 0x8000;
66b412
+  .text           :
66b412
+  {
66b412
+    *(.before)
66b412
+    *(.text)
66b412
+    *(.after)
66b412
+  } =0
66b412
+  . = 0x9000;
66b412
+  .got            : { *(.got) *(.got.plt)}
66b412
+  . = 0x10000;
66b412
+  .rela.dyn       : { *(.rela.ifunc) }
66b412
+  . = 0x11000;
66b412
+  .rela.plt       : { *(.rela.plt) *(.rela.iplt) }
66b412
+  . = 0x12340000;
66b412
+  .far : { *(.far) }
66b412
+  .ARM.attributes 0 : { *(.ARM.atttributes) }
66b412
+}
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-now.d	2019-07-02 17:34:37.557063849 +0100
66b412
@@ -0,0 +1,67 @@
66b412
+#source: variant_pcs-1.s
66b412
+#source: variant_pcs-2.s
66b412
+#ld: -shared --hash-style=sysv -T variant_pcs.ld -z now
66b412
+#readelf: -rsW
66b412
+
66b412
+Relocation section '\.rela\.plt' at offset 0x11000 contains 12 entries:
66b412
+    Offset             Info             Type               Symbol's Value  Symbol's Name \+ Addend
66b412
+0000000000009020  0000000100000402 R_AARCH64_JUMP_SLOT    0000000000000000 f_base_global_default_undef \+ 0
66b412
+0000000000009028  0000000200000402 R_AARCH64_JUMP_SLOT    0000000000000000 f_spec_global_default_undef \+ 0
66b412
+0000000000009030  0000000400000402 R_AARCH64_JUMP_SLOT    0000000000008000 f_base_global_default_def \+ 0
66b412
+0000000000009038  0000000500000402 R_AARCH64_JUMP_SLOT    0000000000008000 f_spec_global_default_def \+ 0
66b412
+0000000000009040  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009048  0000000300000402 R_AARCH64_JUMP_SLOT    f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0
66b412
+0000000000009050  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009058  0000000600000402 R_AARCH64_JUMP_SLOT    f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0
66b412
+0000000000009060  0000000000000408 R_AARCH64_IRELATIVE                       8038
66b412
+0000000000009068  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009070  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009078  0000000000000408 R_AARCH64_IRELATIVE                       8038
66b412
+
66b412
+Symbol table '\.dynsym' contains 7 entries:
66b412
+   Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
+     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
+     1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+     4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+     6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
+
66b412
+Symbol table '\.symtab' contains 35 entries:
66b412
+   Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
+     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
+     1: 0000000000008000     0 SECTION LOCAL  DEFAULT    1 
66b412
+     2: 0000000000008070     0 SECTION LOCAL  DEFAULT    2 
66b412
+     3: 0000000000009000     0 SECTION LOCAL  DEFAULT    3 
66b412
+     4: 0000000000009080     0 SECTION LOCAL  DEFAULT    4 
66b412
+     5: 0000000000011000     0 SECTION LOCAL  DEFAULT    5 
66b412
+     6: 0000000000011120     0 SECTION LOCAL  DEFAULT    6 
66b412
+     7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
66b412
+     8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
66b412
+     9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
66b412
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
66b412
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
66b412
+    12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
66b412
+    13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
66b412
+    14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
+    15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
66b412
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
66b412
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
66b412
+    18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
66b412
+    19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
66b412
+    20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
+    21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
66b412
+    22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
66b412
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
66b412
+    24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
66b412
+    25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
66b412
+    26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
66b412
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
66b412
+    28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
66b412
+    29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+    32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+    34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-r.d	2019-07-02 17:35:35.244655166 +0100
66b412
@@ -0,0 +1,60 @@
66b412
+#source: variant_pcs-1.s
66b412
+#source: variant_pcs-2.s
66b412
+#ld: -r
66b412
+#readelf: -rsW
66b412
+
66b412
+Relocation section '\.rela\.text' at offset .* contains 24 entries:
66b412
+    Offset             Info             Type               Symbol's Value  Symbol's Name \+ Addend
66b412
+0000000000000000  000000180000011b R_AARCH64_CALL26       0000000000000000 f_spec_global_default_def \+ 0
66b412
+0000000000000004  000000110000011b R_AARCH64_CALL26       0000000000000000 f_spec_global_default_undef \+ 0
66b412
+0000000000000008  000000120000011b R_AARCH64_CALL26       0000000000000000 f_spec_global_hidden_def \+ 0
66b412
+0000000000000010  000000170000011b R_AARCH64_CALL26       0000000000000000 f_base_global_default_def \+ 0
66b412
+0000000000000014  000000100000011b R_AARCH64_CALL26       0000000000000000 f_base_global_default_undef \+ 0
66b412
+0000000000000018  000000150000011b R_AARCH64_CALL26       0000000000000000 f_base_global_hidden_def \+ 0
66b412
+0000000000000020  000000140000011b R_AARCH64_CALL26       f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0
66b412
+0000000000000024  000000160000011b R_AARCH64_CALL26       f_spec_global_hidden_ifunc\(\) f_spec_global_hidden_ifunc \+ 0
66b412
+0000000000000028  000000060000011b R_AARCH64_CALL26       f_spec_local_ifunc\(\) f_spec_local_ifunc \+ 0
66b412
+000000000000002c  000000190000011b R_AARCH64_CALL26       f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0
66b412
+0000000000000030  000000130000011b R_AARCH64_CALL26       f_base_global_hidden_ifunc\(\) f_base_global_hidden_ifunc \+ 0
66b412
+0000000000000034  000000070000011b R_AARCH64_CALL26       f_base_local_ifunc\(\) f_base_local_ifunc \+ 0
66b412
+0000000000000038  000000180000011b R_AARCH64_CALL26       0000000000000000 f_spec_global_default_def \+ 0
66b412
+000000000000003c  000000110000011b R_AARCH64_CALL26       0000000000000000 f_spec_global_default_undef \+ 0
66b412
+0000000000000040  000000120000011b R_AARCH64_CALL26       0000000000000000 f_spec_global_hidden_def \+ 0
66b412
+0000000000000048  000000170000011b R_AARCH64_CALL26       0000000000000000 f_base_global_default_def \+ 0
66b412
+000000000000004c  000000100000011b R_AARCH64_CALL26       0000000000000000 f_base_global_default_undef \+ 0
66b412
+0000000000000050  000000150000011b R_AARCH64_CALL26       0000000000000000 f_base_global_hidden_def \+ 0
66b412
+0000000000000058  000000140000011b R_AARCH64_CALL26       f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0
66b412
+000000000000005c  000000160000011b R_AARCH64_CALL26       f_spec_global_hidden_ifunc\(\) f_spec_global_hidden_ifunc \+ 0
66b412
+0000000000000060  0000000c0000011b R_AARCH64_CALL26       f_spec_local2_ifunc\(\) f_spec_local2_ifunc \+ 0
66b412
+0000000000000064  000000190000011b R_AARCH64_CALL26       f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0
66b412
+0000000000000068  000000130000011b R_AARCH64_CALL26       f_base_global_hidden_ifunc\(\) f_base_global_hidden_ifunc \+ 0
66b412
+000000000000006c  0000000d0000011b R_AARCH64_CALL26       f_base_local2_ifunc\(\) f_base_local2_ifunc \+ 0
66b412
+
66b412
+Symbol table '\.symtab' contains 26 entries:
66b412
+   Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
+     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
+     1: 0000000000000000     0 SECTION LOCAL  DEFAULT    1 
66b412
+     2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
66b412
+     3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
66b412
+     4: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
66b412
+     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
66b412
+     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
66b412
+     7: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
66b412
+     8: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
66b412
+     9: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
+    10: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
66b412
+    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
66b412
+    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
66b412
+    13: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
66b412
+    14: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
66b412
+    15: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
+    16: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
+    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
+    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_def
66b412
+    19: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_base_global_hidden_ifunc
66b412
+    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+    21: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_base_global_hidden_def
66b412
+    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
66b412
+    23: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
+    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+    25: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
--- /dev/null	2019-07-02 08:01:33.386842704 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2019-07-02 17:34:45.635006622 +0100
66b412
@@ -0,0 +1,67 @@
66b412
+#source: variant_pcs-1.s
66b412
+#source: variant_pcs-2.s
66b412
+#ld: -shared --hash-style=sysv -T variant_pcs.ld
66b412
+#readelf: -rsW
66b412
+
66b412
+Relocation section '\.rela\.plt' at offset 0x11000 contains 12 entries:
66b412
+    Offset             Info             Type               Symbol's Value  Symbol's Name \+ Addend
66b412
+0000000000009020  0000000100000402 R_AARCH64_JUMP_SLOT    0000000000000000 f_base_global_default_undef \+ 0
66b412
+0000000000009028  0000000200000402 R_AARCH64_JUMP_SLOT    0000000000000000 f_spec_global_default_undef \+ 0
66b412
+0000000000009030  0000000400000402 R_AARCH64_JUMP_SLOT    0000000000008000 f_base_global_default_def \+ 0
66b412
+0000000000009038  0000000500000402 R_AARCH64_JUMP_SLOT    0000000000008000 f_spec_global_default_def \+ 0
66b412
+0000000000009040  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009048  0000000300000402 R_AARCH64_JUMP_SLOT    f_spec_global_default_ifunc\(\) f_spec_global_default_ifunc \+ 0
66b412
+0000000000009050  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009058  0000000600000402 R_AARCH64_JUMP_SLOT    f_base_global_default_ifunc\(\) f_base_global_default_ifunc \+ 0
66b412
+0000000000009060  0000000000000408 R_AARCH64_IRELATIVE                       8038
66b412
+0000000000009068  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009070  0000000000000408 R_AARCH64_IRELATIVE                       8000
66b412
+0000000000009078  0000000000000408 R_AARCH64_IRELATIVE                       8038
66b412
+
66b412
+Symbol table '\.dynsym' contains 7 entries:
66b412
+   Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
+     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
+     1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+     4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+     6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
+
66b412
+Symbol table '\.symtab' contains 35 entries:
66b412
+   Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
+     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
+     1: 0000000000008000     0 SECTION LOCAL  DEFAULT    1 
66b412
+     2: 0000000000008070     0 SECTION LOCAL  DEFAULT    2 
66b412
+     3: 0000000000009000     0 SECTION LOCAL  DEFAULT    3 
66b412
+     4: 0000000000009080     0 SECTION LOCAL  DEFAULT    4 
66b412
+     5: 0000000000011000     0 SECTION LOCAL  DEFAULT    5 
66b412
+     6: 0000000000011120     0 SECTION LOCAL  DEFAULT    6 
66b412
+     7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
66b412
+     8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
66b412
+     9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
66b412
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
66b412
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
66b412
+    12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
66b412
+    13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
66b412
+    14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
+    15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
66b412
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
66b412
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
66b412
+    18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
66b412
+    19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
66b412
+    20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
+    21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
66b412
+    22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
66b412
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
66b412
+    24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
66b412
+    25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
66b412
+    26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
66b412
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
66b412
+    28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
66b412
+    29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+    32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+    34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-now.d
66b412
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d	2019-07-03 10:06:20.012412075 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-now.d	2019-07-03 10:20:51.959203582 +0100
66b412
@@ -22,10 +22,10 @@ Symbol table '\.dynsym' contains 7 entri
66b412
    Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_spec_global_default_undef 	\[VARIANT_PCS\] 
66b412
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_spec_global_default_ifunc 	\[VARIANT_PCS\] 
66b412
      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_spec_global_default_def 	\[VARIANT_PCS\] 
66b412
      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
 
66b412
 Symbol table '\.symtab' contains 35 entries:
66b412
@@ -40,28 +40,28 @@ Symbol table '\.symtab' contains 35 entr
66b412
      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
66b412
      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
66b412
      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
66b412
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
66b412
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
66b412
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_local 	\[VARIANT_PCS\] 
66b412
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_spec_local_ifunc 	\[VARIANT_PCS\] 
66b412
     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
66b412
     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
66b412
     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
66b412
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
66b412
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
66b412
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_local2 	\[VARIANT_PCS\] 
66b412
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_spec_local2_ifunc 	\[VARIANT_PCS\] 
66b412
     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
66b412
     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
66b412
     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
66b412
     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
66b412
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
66b412
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_global_hidden_def 	\[VARIANT_PCS\] 
66b412
     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
66b412
     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
66b412
     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
66b412
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
66b412
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_spec_global_hidden_ifunc 	\[VARIANT_PCS\] 
66b412
     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
66b412
     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_spec_global_default_undef 	\[VARIANT_PCS\] 
66b412
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_spec_global_default_ifunc 	\[VARIANT_PCS\] 
66b412
     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_spec_global_default_def 	\[VARIANT_PCS\] 
66b412
     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-r.d
66b412
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d	2019-07-03 10:06:20.012412075 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-r.d	2019-07-03 10:14:28.152933189 +0100
66b412
@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr
66b412
      2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
66b412
      3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
66b412
      4: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
66b412
-     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
66b412
-     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
66b412
+     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_local 	\[VARIANT_PCS\] 
66b412
+     6: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_spec_local_ifunc 	\[VARIANT_PCS\] 
66b412
      7: 0000000000000000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
66b412
      8: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
66b412
      9: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
     10: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
66b412
-    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
66b412
-    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
66b412
+    11: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_local2 	\[VARIANT_PCS\] 
66b412
+    12: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_spec_local2_ifunc 	\[VARIANT_PCS\] 
66b412
     13: 0000000000000038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
66b412
     14: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
66b412
     15: 0000000000000038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
     16: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
-    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
-    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_def
66b412
+    17: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_spec_global_default_undef 	\[VARIANT_PCS\] 
66b412
+    18: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_spec_global_hidden_def 	\[VARIANT_PCS\] 
66b412
     19: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_base_global_hidden_ifunc
66b412
-    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+    20: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_spec_global_default_ifunc 	\[VARIANT_PCS\] 
66b412
     21: 0000000000000000     0 NOTYPE  GLOBAL HIDDEN     1 f_base_global_hidden_def
66b412
-    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN  \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
66b412
+    22: 0000000000000000     0 IFUNC   GLOBAL HIDDEN     1 f_spec_global_hidden_ifunc 	\[VARIANT_PCS\] 
66b412
     23: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
-    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+    24: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 f_spec_global_default_def 	\[VARIANT_PCS\] 
66b412
     25: 0000000000000000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
diff -rup binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-shared.d
66b412
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2019-07-03 10:06:20.012412075 +0100
66b412
+++ binutils-2.32/ld/testsuite/ld-aarch64/variant_pcs-shared.d	2019-07-03 10:19:00.760994532 +0100
66b412
@@ -22,10 +22,10 @@ Symbol table '\.dynsym' contains 7 entri
66b412
    Num:    Value          Size Type    Bind   Vis      Ndx Name
66b412
      0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
66b412
      1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
-     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
-     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+     2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_spec_global_default_undef 	\[VARIANT_PCS\] 
66b412
+     3: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_spec_global_default_ifunc 	\[VARIANT_PCS\] 
66b412
      4: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
-     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+     5: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_spec_global_default_def 	\[VARIANT_PCS\] 
66b412
      6: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc
66b412
 
66b412
 Symbol table '\.symtab' contains 35 entries:
66b412
@@ -40,28 +40,28 @@ Symbol table '\.symtab' contains 35 entr
66b412
      7: 00000000000111c8     0 SECTION LOCAL  DEFAULT    7 
66b412
      8: 0000000000011270     0 SECTION LOCAL  DEFAULT    8 
66b412
      9: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-1\.o
66b412
-    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local
66b412
-    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local_ifunc
66b412
+    10: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_local 	\[VARIANT_PCS\] 
66b412
+    11: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_spec_local_ifunc 	\[VARIANT_PCS\] 
66b412
     12: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_local_ifunc
66b412
     13: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local
66b412
     14: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
     15: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS .*variant_pcs-2\.o
66b412
-    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2
66b412
-    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_local2_ifunc
66b412
+    16: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_local2 	\[VARIANT_PCS\] 
66b412
+    17: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_spec_local2_ifunc 	\[VARIANT_PCS\] 
66b412
     18: 0000000000008038     0 IFUNC   LOCAL  DEFAULT    1 f_base_local2_ifunc
66b412
     19: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 f_base_local2
66b412
     20: 0000000000008038     0 NOTYPE  LOCAL  DEFAULT    1 \$x
66b412
     21: 0000000000000000     0 FILE    LOCAL  DEFAULT  ABS 
66b412
     22: 0000000000009080     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
66b412
-    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_def
66b412
+    23: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_spec_global_hidden_def 	\[VARIANT_PCS\] 
66b412
     24: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_base_global_hidden_ifunc
66b412
     25: 0000000000008000     0 NOTYPE  LOCAL  DEFAULT    1 f_base_global_hidden_def
66b412
     26: 0000000000009000     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
66b412
-    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT \[VARIANT_PCS\]     1 f_spec_global_hidden_ifunc
66b412
+    27: 0000000000008000     0 IFUNC   LOCAL  DEFAULT    1 f_spec_global_hidden_ifunc 	\[VARIANT_PCS\] 
66b412
     28: 0000000000008070     0 NOTYPE  LOCAL  DEFAULT    2 \$x
66b412
     29: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_base_global_default_undef
66b412
-    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]   UND f_spec_global_default_undef
66b412
-    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_ifunc
66b412
+    30: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f_spec_global_default_undef 	\[VARIANT_PCS\] 
66b412
+    31: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_spec_global_default_ifunc 	\[VARIANT_PCS\] 
66b412
     32: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_base_global_default_def
66b412
-    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT \[VARIANT_PCS\]     1 f_spec_global_default_def
66b412
+    33: 0000000000008000     0 NOTYPE  GLOBAL DEFAULT    1 f_spec_global_default_def 	\[VARIANT_PCS\] 
66b412
     34: 0000000000008000     0 IFUNC   GLOBAL DEFAULT    1 f_base_global_default_ifunc