ld: Add pdb support to aarch64-w64-mingw32

This extends PDB support to the aarch64 PE targets.

The changes to the test files are just to make it so they can be assembled as
either x86, x86_64, or aarch64, mainly by changing the comment style.
The only actual code change here is in adding the architecture constants
to pdb.c.

Author: maharmstone

ld/configure.tgt

@@ -121,7 +121,7 @@ aarch64-*-haiku*)	targ_emul=aarch64haiku
 aarch64-*-pe* | aarch64-*-mingw*)
 			targ_emul=aarch64pe
 			targ_extra_emuls="arm64pe"
-			targ_extra_ofiles="deffilep.o pep-dll-aarch64.o pe-dll.o"
+			targ_extra_ofiles="deffilep.o pep-dll-aarch64.o pe-dll.o pdb.o"
 			;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 			targ_emul=elf64alpha_fbsd

ld/emultempl/pep.em

@@ -79,7 +79,8 @@ EOF
 
 case ${target} in
   x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \
-  i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
+  i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe | \
+  aarch64-*-mingw* | aarch64-*-pe* )
 fragment <<EOF
 #include "pdb.h"
 EOF

ld/pdb.c

@@ -591,13 +591,20 @@ populate_type_stream (bfd *pdb, bfd *stream, struct types *types)
 static uint16_t
 get_arch_number (bfd *abfd)
 {
-  if (abfd->arch_info->arch != bfd_arch_i386)
-    return 0;
+  switch (abfd->arch_info->arch)
+    {
+    case bfd_arch_i386:
+      if (abfd->arch_info->mach & bfd_mach_x86_64)
+	return IMAGE_FILE_MACHINE_AMD64;
+      else
+	return IMAGE_FILE_MACHINE_I386;
 
-  if (abfd->arch_info->mach & bfd_mach_x86_64)
-    return IMAGE_FILE_MACHINE_AMD64;
+    case bfd_arch_aarch64:
+      return IMAGE_FILE_MACHINE_ARM64;
 
-  return IMAGE_FILE_MACHINE_I386;
+    default:
+      return 0;
+    }
 }
 
 /* Validate the DEBUG_S_FILECHKSMS entry within a module's .debug$S
@@ -3618,13 +3625,20 @@ handle_debugt_section (asection *s, bfd *mod, struct types *types,
 static uint16_t
 target_processor (bfd *abfd)
 {
-  if (abfd->arch_info->arch != bfd_arch_i386)
-    return 0;
+  switch (abfd->arch_info->arch)
+    {
+    case bfd_arch_i386:
+      if (abfd->arch_info->mach & bfd_mach_x86_64)
+	return CV_CFL_X64;
+      else
+	return CV_CFL_80386;
 
-  if (abfd->arch_info->mach & bfd_mach_x86_64)
-    return CV_CFL_X64;
-  else
-    return CV_CFL_80386;
+    case bfd_arch_aarch64:
+      return CV_CFL_ARM64;
+
+    default:
+      return 0;
+    }
 }
 
 /* Create the symbols that go in "* Linker *", the dummy module created

ld/pdb.h

@@ -820,6 +820,7 @@ struct objname
 
 #define CV_CFL_80386			0x03
 #define CV_CFL_X64			0xD0
+#define CV_CFL_ARM64			0xF6
 
 #define CV_CFL_LINK			0x07
 

ld/testsuite/ld-pe/pdb-syms1a.s

@@ -26,20 +26,20 @@
 .gproc2:
 .short .gproc2_end - .gproc2 - 2
 .short S_GPROC32
-.long 0 # parent
-.long 0 # end
-.long 0 # next symbol
-.long 1 # length
-.long 0 # debug start offset
-.long 0 # debug end offset
-.long 0x1002 # type
+.long 0 /* parent */
+.long 0 /* end */
+.long 0 /* next symbol */
+.long 1 /* length */
+.long 0 /* debug start offset */
+.long 0 /* debug end offset */
+.long 0x1002 /* type */
 .secrel32 proc2
 .secidx proc2
-.byte 0 # flags
+.byte 0 /* flags */
 .asciz "proc2"
-.byte 0xf3 # padding
-.byte 0xf2 # padding
-.byte 0xf1 # padding
+.byte 0xf3 /* padding */
+.byte 0xf2 /* padding */
+.byte 0xf1 /* padding */
 
 .gproc2_end:
 .short .udt1 - .gproc2_end - 2
@@ -48,7 +48,7 @@
 .udt1:
 .short .syms_end - .udt1 - 2
 .short S_UDT
-.long 0x1004 # struct bar
+.long 0x1004 /* struct bar */
 .asciz "bar"
 
 .syms_end:
@@ -57,54 +57,54 @@
 
 .long CV_SIGNATURE_C13
 
-# Type 1000, const uint32_t
+/* Type 1000, const uint32_t */
 .mod1:
 .short .arglist1 - .mod1 - 2
 .short LF_MODIFIER
 .long T_UINT4
-.short 1 # const
+.short 1 /* const */
 .p2align 2
 
-# Type 1001, arglist (uint32_t)
+/* Type 1001, arglist (uint32_t) */
 .arglist1:
 .short .proctype1 - .arglist1 - 2
 .short LF_ARGLIST
-.long 1 # no. entries
+.long 1 /* no. entries */
 .long T_UINT4
 
 # Type 1002, procedure (return type T_VOID, arglist 1001)
 .proctype1:
 .short .fieldlist1 - .proctype1 - 2
 .short LF_PROCEDURE
 .long T_VOID
-.byte 0 # calling convention
-.byte 0 # attributes
-.short 1 # no. parameters
+.byte 0 /* calling convention */
+.byte 0 /* attributes */
+.short 1 /* no. parameters */
 .long 0x1001
 
-# Type 1003, field list for struct bar
+/* Type 1003, field list for struct bar */
 .fieldlist1:
 .short .struct1 - .fieldlist1 - 2
 .short LF_FIELDLIST
 .short LF_MEMBER
-.short 3 # public
+.short 3 /* public */
 .long T_UINT4
-.short 0 # offset
+.short 0 /* offset */
 .asciz "num1"
-.byte 0xf1 # padding
+.byte 0xf1 /* padding */
 
-# Type 1004, declaration of struct bar
+/* Type 1004, declaration of struct bar */
 .struct1:
 .short .types_end - .struct1 - 2
 .short LF_STRUCTURE
-.short 1 # no. members
-.short 0 # property
-.long 0x1003 # field list
-.long 0 # type derived from
-.long 0 # type of vshape table
-.short 4 # size
-.asciz "bar" # name
-.byte 0xf2 # padding
-.byte 0xf1 # padding
+.short 1 /* no. members */
+.short 0 /* property */
+.long 0x1003 /* field list */
+.long 0 /* type derived from */
+.long 0 /* type of vshape table */
+.short 4 /* size */
+.asciz "bar" /* name */
+.byte 0xf2 /* padding */
+.byte 0xf1 /* padding */
 
 .types_end: