Refine support for aarch64-pe across binutils

Message ID BL0PR02MB4900FCC9606C0B1211F0DCC593479@BL0PR02MB4900.namprd02.prod.outlook.com
State New
Headers show
Series
  • Refine support for aarch64-pe across binutils
Related show

Commit Message

H.J. Lu via Binutils Jan. 1, 2022, 3:21 p.m.
(I figured I would open up a new thread for the new year)

This allows aarch64-pe to be targetted natively, not having to use objcopy to convert it from ELF to PE. Note that support is very limited,
there is a bug in GAS or BFD that needs to be fixed, plus relocations need to be supported. Also, there probably should be more testing done.
GAS and LD's testsuites also need some work; GAS has a lot of ELF specific tests that need to be seperated, plus relocation support is needed
for others. LD's tests also need some work as well. This commit also adds a new LLP64 ABI to AArch64. This cannot be selected from ELF targets,
and only can be used be PE targets.

From 4e601f23576fcf7464dd991b24ce01681e93cba9 Mon Sep 17 00:00:00 2001
From: Jedidiah Thompson <wej22007@outlook.com>

Date: Mon, 27 Dec 2021 12:05:46 -0500
Subject: [PATCH] Refine support for aarch64-pe in GAS, LD, BFD

This allows aarch64-pe to be targetted natively, not having to use objcopy to convert it from ELF to PE. Note that support is very limited,
there is a bug in GAS or BFD that needs to be fixed, plus relocations need to be supported. Also, there probably should be more testing done.
GAS and LD's testsuites also need some work; GAS has a lot of ELF specific tests that need to be seperated, plus relocation support is needed
for others. LD's tests also need some work as well. This commit also adds a new LLP64 ABI to AArch64. This cannot be selected from ELF targets,
and only can be used be PE targets.
---
 bfd/ChangeLog                     | 31 +++++++++++++
 bfd/Makefile.am                   |  2 +
 bfd/Makefile.in                   |  4 ++
 bfd/archures.c                    |  1 +
 bfd/bfd-in2.h                     |  1 +
 bfd/bfd.c                         |  1 +
 bfd/coff-aarch64.c                |  4 +-
 bfd/config.bfd                    | 16 ++++++-
 bfd/configure                     | 33 ++++++++++----
 bfd/configure.ac                  |  3 +-
 bfd/cpu-aarch64.c                 | 27 ++++++++---
 bfd/doc/Makefile.in               |  1 +
 bfd/pe-aarch64.c                  | 74 +++++++++++++++++++++++++++++++
 bfd/pei-aarch64.c                 |  2 +-
 bfd/peicode.h                     |  2 +
 bfd/targets.c                     |  6 ++-
 binutils/dlltool.c                |  3 ++
 gas/ChangeLog                     |  9 ++++
 gas/NEWS                          |  4 ++
 gas/config/obj-coff.h             |  4 ++
 gas/config/tc-aarch64.c           | 48 ++++++++++++++------
 gas/config/tc-aarch64.h           | 29 +++++-------
 gas/config/te-pepaarch64.h        | 29 ++++++++++++
 gas/configure.tgt                 |  1 +
 gas/testsuite/gas/pe/pe-aarch64.d | 15 +++++++
 gas/testsuite/gas/pe/pe-aarch64.s | 11 +++++
 gas/testsuite/gas/pe/pe.exp       |  6 ++-
 gdb/coff-pe-read.c                |  8 +++-
 ld/ChangeLog                      | 20 +++++++++
 ld/Makefile.am                    |  1 +
 ld/Makefile.in                    |  3 ++
 ld/NEWS                           |  4 ++
 ld/configure                      | 30 +++++++++----
 ld/configure.tgt                  |  6 ++-
 ld/emulparams/aarch64pe.sh        |  9 ++++
 ld/emultempl/pep.em               |  8 ++++
 ld/pe-dll.c                       | 44 ++++++++++++++----
 ld/pep-dll-aarch64.c              | 23 ++++++++++
 ld/pep-dll-x86_64.c               | 22 +++++++++
 ld/pep-dll.c                      |  5 +--
 ld/testsuite/ld-pe/pe-aarch64.d   | 16 +++++++
 ld/testsuite/ld-pe/pe-aarch64.s   | 13 ++++++
 ld/testsuite/ld-pe/pe.exp         |  4 ++
 43 files changed, 504 insertions(+), 79 deletions(-)
 create mode 100644 bfd/pe-aarch64.c
 create mode 100644 gas/config/te-pepaarch64.h
 create mode 100644 gas/testsuite/gas/pe/pe-aarch64.d
 create mode 100644 gas/testsuite/gas/pe/pe-aarch64.s
 create mode 100644 ld/emulparams/aarch64pe.sh
 create mode 100644 ld/pep-dll-aarch64.c
 create mode 100644 ld/pep-dll-x86_64.c
 create mode 100644 ld/testsuite/ld-pe/pe-aarch64.d
 create mode 100644 ld/testsuite/ld-pe/pe-aarch64.s

--
2.32.0

Patch

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 24311710088..61a6efd34bf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,34 @@ 
+2021-12-30 Jedidiah Thompson  <wej22007@outlook.com>
+
+    * Makefile.am:           Add pe-aarch64.c to source files
+    * Makefile.in:           Regenerate
+    * bfd.c:                 Add pe-aarch64-little to COFF targets in
+                             bfd_get_sign_extend_vma
+    * coff-aarch64.c:        Ensure that that target name and vector always
+                         get specified, so that there is no default
+    * config.bfd:            Add aarch64-pe target triple, change
+                             aarch64_pei_vec to aarch64_pei_le_vec, and warn
+                             that aarch64-pe is an incomplete target
+    * configure.ac:          Add aarch64_pe_le_vec vector, change
+                             aarch64_pei_vec to aarch64_pei_le_vec
+    * configure:             Regenerate
+    * pe-aarch64.c:          New file that specifies the pe-aarch64-little
+                             target, which is an object file target for PE
+                             on aarch64
+    * pei-aarch64.c:         Change target vector from aarch64_pei_vec to
+                             to aarch64_pei_le_vec
+    * peicode.h:             Add coff_swap_file_hdr_out definition for
+                             pe-aarch64
+    * doc/Makefile.in:       Regenerate
+    * targets.c:             Rename aarch64_pei_vec to aarch64_pei_le_vec; add
+                             aarch64_pe_le_vec
+    * archures.c, bfd-in2.h: Add LLP64 ABI definition
+    * cpu-aarch64.c:         Add test to ensure that LLP64 is not being mixed
+                             with other data models, change macro N to allow
+                             for different address and machine word sizes,
+                             add aarch64:llp64 architecture, allow for LLP64
+                             to be the default data model on PE / COFF
+
 2021-12-15  Nikita Popov  <npv1310@gmail.com>

  PR 28687
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 4960cb500b1..4e51f2f9efe 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -575,6 +575,7 @@  BFD64_BACKENDS = \
  pe-aarch64igen.lo \
  pe-x86_64.lo \
  pei-aarch64.lo \
+ pe-aarch64.lo \
  pei-ia64.lo \
  pei-x86_64.lo \
  pepigen.lo \
@@ -616,6 +617,7 @@  BFD64_BACKENDS_CFILES = \
  mmo.c \
  pe-x86_64.c \
  pei-aarch64.c \
+ pe-aarch64.c \
  pei-ia64.c \
  pei-x86_64.c \
  vms-alpha.c
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index a838262bc78..88cd46e341b 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -439,6 +439,7 @@  pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1002,6 +1003,7 @@  BFD64_BACKENDS = \
  pe-aarch64igen.lo \
  pe-x86_64.lo \
  pei-aarch64.lo \
+ pe-aarch64.lo \
  pei-ia64.lo \
  pei-x86_64.lo \
  pepigen.lo \
@@ -1043,6 +1045,7 @@  BFD64_BACKENDS_CFILES = \
  mmo.c \
  pe-x86_64.c \
  pei-aarch64.c \
+ pe-aarch64.c \
  pei-ia64.c \
  pei-x86_64.c \
  vms-alpha.c
@@ -1574,6 +1577,7 @@  distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osf-core.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pc532-mach.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdp11.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-aarch64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-aarch64igen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-arm-wince.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-arm.Plo@am__quote@
diff --git a/bfd/archures.c b/bfd/archures.c
index 441283b51a6..62ba16b9aae 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -533,6 +533,7 @@  DESCRIPTION
 .#define bfd_mach_aarch64 0
 .#define bfd_mach_aarch64_8R 1
 .#define bfd_mach_aarch64_ilp32 32
+.#define bfd_mach_aarch64_llp64 64
 .  bfd_arch_nios2,     {* Nios II.  *}
 .#define bfd_mach_nios2 0
 .#define bfd_mach_nios2r1 1
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 7b7a329cd62..9b3b66a1359 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1907,6 +1907,7 @@  enum bfd_architecture
 #define bfd_mach_aarch64 0
 #define bfd_mach_aarch64_8R    1
 #define bfd_mach_aarch64_ilp32 32
+#define bfd_mach_aarch64_llp64 64
   bfd_arch_nios2,     /* Nios II.  */
 #define bfd_mach_nios2         0
 #define bfd_mach_nios2r1       1
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 2eff8150023..089c22c6fa0 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -1739,6 +1739,7 @@  bfd_get_sign_extend_vma (bfd *abfd)
       || strcmp (name, "pe-x86-64") == 0
       || strcmp (name, "pei-x86-64") == 0
       || strcmp (name, "pei-aarch64-little") == 0
+  || strcmp (name, "pe-aarch64-little") == 0
       || strcmp (name, "pe-arm-wince-little") == 0
       || strcmp (name, "pei-arm-wince-little") == 0
       || strcmp (name, "aixcoff-rs6000") == 0
diff --git a/bfd/coff-aarch64.c b/bfd/coff-aarch64.c
index a9bc417fae8..9aa7d6a2280 100644
--- a/bfd/coff-aarch64.c
+++ b/bfd/coff-aarch64.c
@@ -89,13 +89,13 @@  const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
 #else
-  aarch64_pei_vec =
+# error "target symbol name not specified"
 #endif
 {
 #ifdef TARGET_NAME
   TARGET_NAME,
 #else
- "pei-aarch64-little", /* Name.  */
+# error "target name not specified"
 #endif
   bfd_target_coff_flavour,
   BFD_ENDIAN_LITTLE, /* Data byte order is little.  */
diff --git a/bfd/config.bfd b/bfd/config.bfd
index c062ef8b44c..e9188870f6d 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -249,9 +249,15 @@  case "${targ}" in
     ;;
   aarch64-*-elf | aarch64-*-rtems* | aarch64-*-genode*)
     targ_defvec=aarch64_elf64_le_vec
-    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_vec"
+    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_le_vec"
     want64=true
     ;;
+  aarch64-*-pe)
+    targ_defvec=aarch64_pe_le_vec
+    targ_selvecs="aarch64_pei_le_vec aarch64_elf64_le_vec arm_pe_le_vec arm_pei_le_vec"
+    want64=true
+    targ_underscore=no
+    ;;
   aarch64_be-*-elf)
     targ_defvec=aarch64_elf64_be_vec
     targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
@@ -279,7 +285,7 @@  case "${targ}" in
     ;;
   aarch64-*-linux* | aarch64-*-netbsd*)
     targ_defvec=aarch64_elf64_le_vec
-    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_vec"
+    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec aarch64_pei_le_vec"
     want64=true
     ;;
   aarch64_be-*-linux* | aarch64_be-*-netbsd*)
@@ -1534,3 +1540,9 @@  case "${targ_defvec} ${targ_selvecs}" in
     targ_archs="$targ_archs bfd_k1om_arch"
     ;;
 esac
+
+if test x"$targ_defvec" = x"aarch64-pe"; then
+  # Not currently complete (and probably not stable), warn user
+  echo "*** WARNING BFD aarch64-pe support not complete nor stable"
+  echo "*** Do not rely on this for production purposes"
+fi
diff --git a/bfd/configure b/bfd/configure
index d4aa2178b29..3360cc89587 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -794,6 +794,7 @@  infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -891,6 +892,7 @@  datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1143,6 +1145,15 @@  do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1280,7 +1291,7 @@  fi
 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
  datadir sysconfdir sharedstatedir localstatedir includedir \
  oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1433,6 +1444,7 @@  Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -11084,7 +11096,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11087 "configure"
+#line 11099 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -11190,7 +11202,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11193 "configure"
+#line 11205 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -11620,7 +11632,7 @@  else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -11666,7 +11678,7 @@  else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -11690,7 +11702,7 @@  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -11735,7 +11747,7 @@  else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -11759,7 +11771,7 @@  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -13296,7 +13308,8 @@  do
     aarch64_elf64_le_vec)   tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     aarch64_mach_o_vec) tb="$tb mach-o-aarch64.lo"; target_size=64 ;;
-    aarch64_pei_vec) tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
+    aarch64_pei_le_vec) tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
+    aarch64_pe_le_vec)     tb="$tb pe-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
     alpha_ecoff_le_vec) tb="$tb coff-alpha.lo ecoff.lo $ecoff"; target_size=64 ;;
     alpha_elf64_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
     alpha_elf64_fbsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
@@ -14993,6 +15006,8 @@  main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
diff --git a/bfd/configure.ac b/bfd/configure.ac
index a578c3a019e..57c2123cb5e 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -437,7 +437,8 @@  do
     aarch64_elf64_le_vec)   tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     aarch64_mach_o_vec) tb="$tb mach-o-aarch64.lo"; target_size=64 ;;
-    aarch64_pei_vec) tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
+    aarch64_pei_le_vec) tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
+    aarch64_pe_le_vec)     tb="$tb pe-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
     alpha_ecoff_le_vec) tb="$tb coff-alpha.lo ecoff.lo $ecoff"; target_size=64 ;;
     alpha_elf64_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
     alpha_elf64_fbsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
diff --git a/bfd/cpu-aarch64.c b/bfd/cpu-aarch64.c
index d9d6c1b2f89..cbd764c9d75 100644
--- a/bfd/cpu-aarch64.c
+++ b/bfd/cpu-aarch64.c
@@ -39,9 +39,11 @@  compatible (const bfd_arch_info_type * a, const bfd_arch_info_type * b)
   if (a->mach == b->mach)
     return a;

-  /* Don't allow mixing ilp32 with lp64.  */
+  /* Don't allow mixing data models  */
   if ((a->mach & bfd_mach_aarch64_ilp32) != (b->mach & bfd_mach_aarch64_ilp32))
     return NULL;
+  if ((a->mach & bfd_mach_aarch64_llp64) != (b->mach & bfd_mach_aarch64_llp64))
+    return NULL;

   /* Otherwise if either a or b is the 'default' machine
      then it can be polymorphed into the other.  */
@@ -102,20 +104,33 @@  scan (const struct bfd_arch_info *info, const char *string)
   return false;
 }

-#define N(NUMBER, PRINT, WORDSIZE, DEFAULT, NEXT) \
-  { WORDSIZE, WORDSIZE, 8, bfd_arch_aarch64, NUMBER, \
+/* Figure out if llp64 is default */
+#if DEFAULT_VECTOR == aarch64_pe_le_vec
+#define LLP64_DEFAULT true
+#define AARCH64_DEFAULT false
+#else
+#define LLP64_DEFAULT false
+#define AARCH64_DEFAULT true
+#endif
+
+#define N(NUMBER, PRINT, WORDSIZE, ADDRSIZE, DEFAULT, NEXT) \
+  { WORDSIZE, ADDRSIZE, 8, bfd_arch_aarch64, NUMBER, \
     "aarch64", PRINT, 4, DEFAULT, compatible, scan, \
       bfd_arch_default_fill, NEXT, 0 }

 static const bfd_arch_info_type bfd_aarch64_arch_v8_r =
-  N (bfd_mach_aarch64_8R, "aarch64:armv8-r", 64, false, NULL);
+  N (bfd_mach_aarch64_8R, "aarch64:armv8-r", 64, 64, false, NULL);

 static const bfd_arch_info_type bfd_aarch64_arch_ilp32 =
-  N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", 32, false,
+  N (bfd_mach_aarch64_ilp32, "aarch64:ilp32", 32, 32, false,
      &bfd_aarch64_arch_v8_r);

+static const bfd_arch_info_type bfd_aarch64_arch_llp64 =
+  N (bfd_mach_aarch64_llp64, "aarch64:llp64", 32, 64, LLP64_DEFAULT,
+     &bfd_aarch64_arch_ilp32);
+
 const bfd_arch_info_type bfd_aarch64_arch =
-  N (0, "aarch64", 64, true, &bfd_aarch64_arch_ilp32);
+  N (0, "aarch64", 64, 64, AARCH64_DEFAULT, &bfd_aarch64_arch_llp64);

 bool
 bfd_is_aarch64_special_symbol_name (const char *name, int type)
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index c070dd8c458..27e44971e85 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -376,6 +376,7 @@  pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/bfd/pe-aarch64.c b/bfd/pe-aarch64.c
new file mode 100644
index 00000000000..626de309889
--- /dev/null
+++ b/bfd/pe-aarch64.c
@@ -0,0 +1,74 @@ 
+/* BFD back-end for AArch64 PE IMAGE COFF files.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+   This file is part of BFD, the Binary File Descriptor library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#include "sysdep.h"
+#include "bfd.h"
+
+#define TARGET_SYM             aarch64_pe_le_vec
+#define TARGET_NAME            "pe-aarch64-little"
+#define TARGET_ARCHITECTURE    bfd_arch_aarch64
+#define TARGET_PAGESIZE                4096
+#define TARGET_BIG_ENDIAN      0
+#define TARGET_ARCHIVE         0
+#define TARGET_PRIORITY                0
+
+/* Rename the above into.. */
+#define COFF_WITH_peAArch64
+#define COFF_WITH_PE
+#define PCRELOFFSET       true
+
+/* Long section names not allowed in executable images, only object files.  */
+#define COFF_LONG_SECTION_NAMES 1
+
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".rdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
+
+#define PEI_HEADERS
+#include "sysdep.h"
+#include "bfd.h"
+#include "libbfd.h"
+#include "coff/aarch64.h"
+#include "coff/internal.h"
+#include "coff/pe.h"
+#include "libcoff.h"
+#include "libpei.h"
+#include "libiberty.h"
+
+/* Make sure we're setting a 64-bit format.  */
+#undef AOUTSZ
+#define AOUTSZ          PEPAOUTSZ
+#define PEAOUTHDR       PEPAOUTHDR
+
+#include "coff-aarch64.c"
\ No newline at end of file
diff --git a/bfd/pei-aarch64.c b/bfd/pei-aarch64.c
index 99326d16126..308d740555a 100644
--- a/bfd/pei-aarch64.c
+++ b/bfd/pei-aarch64.c
@@ -21,7 +21,7 @@ 
 #include "sysdep.h"
 #include "bfd.h"

-#define TARGET_SYM aarch64_pei_vec
+#define TARGET_SYM aarch64_pei_le_vec
 #define TARGET_NAME "pei-aarch64-little"
 #define TARGET_ARCHITECTURE bfd_arch_aarch64
 #define TARGET_PAGESIZE 4096
diff --git a/bfd/peicode.h b/bfd/peicode.h
index 1e8ed803edc..3306ef92a8a 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -191,6 +191,8 @@  coff_swap_filehdr_in (bfd * abfd, void * src, void * dst)

 #ifdef COFF_IMAGE_WITH_PE
 # define coff_swap_filehdr_out _bfd_XXi_only_swap_filehdr_out
+#elif defined COFF_WITH_peAArch64
+# define coff_swap_filehdr_out _bfd_XX_only_swap_filehdr_out
 #elif defined COFF_WITH_pex64
 # define coff_swap_filehdr_out _bfd_pex64_only_swap_filehdr_out
 #elif defined COFF_WITH_pep
diff --git a/bfd/targets.c b/bfd/targets.c
index 672dc2bb1a4..11a0b9bb55f 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -679,7 +679,8 @@  extern const bfd_target aarch64_elf64_be_cloudabi_vec;
 extern const bfd_target aarch64_elf64_le_vec;
 extern const bfd_target aarch64_elf64_le_cloudabi_vec;
 extern const bfd_target aarch64_mach_o_vec;
-extern const bfd_target aarch64_pei_vec;
+extern const bfd_target aarch64_pei_le_vec;
+extern const bfd_target aarch64_pe_le_vec;
 extern const bfd_target alpha_ecoff_le_vec;
 extern const bfd_target alpha_elf64_vec;
 extern const bfd_target alpha_elf64_fbsd_vec;
@@ -994,7 +995,8 @@  static const bfd_target * const _bfd_target_vector[] =
  &aarch64_elf64_le_vec,
  &aarch64_elf64_le_cloudabi_vec,
  &aarch64_mach_o_vec,
- &aarch64_pei_vec,
+ &aarch64_pei_le_vec,
+ &aarch64_pe_le_vec,
 #endif

 #ifdef BFD64
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 4f337f78d24..6e0f8448dda 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -255,6 +255,9 @@ 
 #ifdef DLLTOOL_DEFAULT_I386
 #include "coff/i386.h"
 #endif
+#ifdef DLLTOOL_DEFAULT_AARCH64
+#include "coff/aarch64.h"
+#endif

 #ifndef COFF_PAGE_SIZE
 #define COFF_PAGE_SIZE ((bfd_vma) 4096)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 77888663077..2c0f806da54 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@ 
+2021-12-30  Jedidiah Thompson <wej22007@outlook.com>
+
+ * configure.tgt:      Add aarch64-pe target triple
+ * config/obj-coff.h:   Ensure coff/aarch64.h gets included when needed
+ * config/tc-aarch64.h: Remove some ELF assumptions
+ * config/tc-aarch64.c: Add COFF cases throughout, remove ELF assumptions,
+                       add new LLP64 ABI
+ * config/te-pep.h:     Add COFF_WITH_peAArch64 definition
+
 2021-12-16  Nick Clifton  <nickc@redhat.com>

  PR 28686
diff --git a/gas/NEWS b/gas/NEWS
index e366252207e..c995576f708 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,9 @@ 
 -*- text -*-

+* Add support for PE / COFF objects on AArch64
+
+* Add LLP64 ABI on AArch64
+
 * Add support for AArch64 system registers that were missing in previous
   releases.

diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 73c001e3edc..641db43ac6d 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -40,6 +40,10 @@ 
 #endif
 #endif

+#ifdef TC_AARCH64
+#include "coff/aarch64.h"
+#endif
+
 #ifdef TC_PPC
 #include "coff/rs6000.h"
 #endif
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index cc7725483aa..f038566d52a 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -30,9 +30,8 @@ 

 #ifdef OBJ_ELF
 #include "elf/aarch64.h"
-#include "dw2gencfi.h"
 #endif
-
+#include "dw2gencfi.h"
 #include "dwarf2dbg.h"

 /* Types of processor to assemble for.  */
@@ -61,13 +60,15 @@  static aarch64_instr_sequence *insn_sequence = NULL;
 #ifdef OBJ_ELF
 /* Pre-defined "_GLOBAL_OFFSET_TABLE_" */
 static symbolS *GOT_symbol;
+#endif

 /* Which ABI to use.  */
 enum aarch64_abi_type
 {
   AARCH64_ABI_NONE = 0,
   AARCH64_ABI_LP64 = 1,
-  AARCH64_ABI_ILP32 = 2
+  AARCH64_ABI_ILP32 = 2,
+  AARCH64_ABI_LLP64 = 3
 };

 #ifndef DEFAULT_ARCH
@@ -75,7 +76,9 @@  enum aarch64_abi_type
 #endif

 /* DEFAULT_ARCH is initialized in gas/configure.tgt.  */
+#ifdef OBJ_ELF
 static const char *default_arch = DEFAULT_ARCH;
+#endif

 /* AArch64 ABI for the output file.  */
 static enum aarch64_abi_type aarch64_abi = AARCH64_ABI_NONE;
@@ -85,7 +88,9 @@  static enum aarch64_abi_type aarch64_abi = AARCH64_ABI_NONE;
    64-bit model, in which the C int type is 32-bits but the C long type
    and all pointer types are 64-bit objects (LP64).  */
 #define ilp32_p (aarch64_abi == AARCH64_ABI_ILP32)
-#endif
+/* When non zero, C types int and long are 32 bit,
+   pointers, however are 64 bit */
+#define llp64_p (aarch64_abi == AARCH64_ABI_LLP64)

 enum vector_el_type
 {
@@ -1475,7 +1480,7 @@  s_unreq (int a ATTRIBUTE_UNUSED)

 /* Directives: Instruction set selection.  */

-#ifdef OBJ_ELF
+#if defined (OBJ_ELF) || defined (OBJ_COFF)
 /* This code is to handle mapping symbols as defined in the ARM AArch64 ELF
    spec.  (See "Mapping symbols", section 4.5.4, ARM AAELF64 version 0.05).
    Note that previously, $a and $t has type STT_FUNC (BSF_OBJECT flag),
@@ -2028,7 +2033,6 @@  s_aarch64_inst (int ignored ATTRIBUTE_UNUSED)
   input_line_pointer--;
   demand_empty_rest_of_line ();
 }
-
 static void
 s_aarch64_cfi_b_key_frame (int ignored ATTRIBUTE_UNUSED)
 {
@@ -8302,7 +8306,7 @@  aarch64_handle_align (fragS * fragP)
   fix = bytes & (noop_size - 1);
   if (fix)
     {
-#ifdef OBJ_ELF
+#if defined (OBJ_ELF) || defined (OBJ_COFF)
       insert_data_mapping_symbol (MAP_INSN, fragP->fr_fix, fragP, fix);
 #endif
       memset (p, 0, fix);
@@ -8361,6 +8365,8 @@  aarch64_init_frag (fragS * fragP, int max_chars)
     }
 }

+#endif /* OBJ_ELF */
+
 /* Initialize the DWARF-2 unwind information for this procedure.  */

 void
@@ -8368,7 +8374,6 @@  tc_aarch64_frame_initial_instructions (void)
 {
   cfi_add_CFA_def_cfa (REG_SP, 0);
 }
-#endif /* OBJ_ELF */

 /* Convert REGNAME to a DWARF-2 register number.  */

@@ -8405,10 +8410,10 @@  tc_aarch64_regname_to_dw2regnum (char *regname)
 int
 aarch64_dwarf2_addr_size (void)
 {
-#if defined (OBJ_MAYBE_ELF) || defined (OBJ_ELF)
   if (ilp32_p)
     return 4;
-#endif
+  else if (llp64_p)
+    return 8;
   return bfd_arch_bits_per_address (stdoutput) / 8;
 }

@@ -9272,7 +9277,6 @@  cons_fix_new_aarch64 (fragS * frag, int where, int size, expressionS * exp)
   fix_new_exp (frag, where, (int) size, exp, pcrel, type);
 }

-#ifdef OBJ_ELF

 /* Implement md_after_parse_args.  This is the earliest time we need to decide
    ABI.  If no -mabi specified, the ABI will be decided by target triplet.  */
@@ -9283,13 +9287,18 @@  aarch64_after_parse_args (void)
   if (aarch64_abi != AARCH64_ABI_NONE)
     return;

+#ifdef OBJ_COFF
+  aarch64_abi = AARCH64_ABI_LLP64;
+#elif defined (OBJ_ELF)
   /* DEFAULT_ARCH will have ":32" extension if it's configured for ILP32.  */
   if (strlen (default_arch) > 7 && strcmp (default_arch + 7, ":32") == 0)
     aarch64_abi = AARCH64_ABI_ILP32;
   else
     aarch64_abi = AARCH64_ABI_LP64;
+#endif
 }

+#ifdef OBJ_ELF
 const char *
 elf64_aarch64_target_format (void)
 {
@@ -9312,6 +9321,12 @@  aarch64elf_frob_symbol (symbolS * symp, int *puntp)
 {
   elf_frob_symbol (symp, puntp);
 }
+#elif defined (OBJ_COFF)
+const char *
+coff_aarch64_target_format (void)
+{
+  return "pe-aarch64-little";
+}
 #endif

 /* MD interface: Finalization. */
@@ -9627,7 +9642,12 @@  md_begin (void)
   cpu_variant = *mcpu_cpu_opt;

   /* Record the CPU type.  */
-  mach = ilp32_p ? bfd_mach_aarch64_ilp32 : bfd_mach_aarch64;
+  if(ilp32_p)
+    mach = bfd_mach_aarch64_ilp32;
+  else if (llp64_p)
+    mach = bfd_mach_aarch64_llp64;
+  else
+    mach = bfd_mach_aarch64;

   bfd_set_arch_mach (stdoutput, TARGET_ARCH, mach);
 }
@@ -10194,9 +10214,10 @@  struct aarch64_option_abi_value_table
   enum aarch64_abi_type value;
 };

+#ifdef OBJ_ELF
 static const struct aarch64_option_abi_value_table aarch64_abis[] = {
   {"ilp32", AARCH64_ABI_ILP32},
-  {"lp64", AARCH64_ABI_LP64},
+  {"lp64", AARCH64_ABI_LP64}
 };

 static int
@@ -10220,6 +10241,7 @@  aarch64_parse_abi (const char *str)
   as_bad (_("unknown abi `%s'\n"), str);
   return 0;
 }
+#endif

 static struct aarch64_long_option_table aarch64_long_opts[] = {
 #ifdef OBJ_ELF
diff --git a/gas/config/tc-aarch64.h b/gas/config/tc-aarch64.h
index 78bff0a1b56..f3957790bce 100644
--- a/gas/config/tc-aarch64.h
+++ b/gas/config/tc-aarch64.h
@@ -59,9 +59,11 @@  struct aarch64_fix
   enum aarch64_opnd opnd;
 };

-#if defined OBJ_ELF
+#ifdef OBJ_ELF
 # define AARCH64_BI_ENDIAN
 # define TARGET_FORMAT elf64_aarch64_target_format ()
+#elif defined (OBJ_COFF)
+# define TARGET_FORMAT coff_aarch64_target_format ()
 #endif

 #define TC_FORCE_RELOCATION(FIX) aarch64_force_relocation (FIX)
@@ -169,7 +171,7 @@  void aarch64_elf_copy_symbol_attributes (symbolS *, symbolS *);
 struct aarch64_frag_type
 {
   int recorded;
-#ifdef OBJ_ELF
+#if defined (OBJ_ELF) || defined (OBJ_COFF)
   /* If there is a mapping symbol at offset 0 in this frag,
      it will be saved in FIRST_MAP.  If there are any mapping
      symbols in this frag, the last one will be saved in
@@ -203,16 +205,17 @@  extern int aarch64_dwarf2_addr_size (void);
 #define DWARF2_ADDR_SIZE(bfd) aarch64_dwarf2_addr_size ()

 #ifdef OBJ_ELF
-# define obj_frob_symbol(sym, punt) aarch64elf_frob_symbol ((sym), & (punt))
+#define obj_frob_symbol(sym, punt) aarch64elf_frob_symbol ((sym), & (punt))
+#endif

-# define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
-# define TC_SEGMENT_INFO_TYPE struct aarch64_segment_info_type
+#define GLOBAL_OFFSET_TABLE_NAME "_GLOBAL_OFFSET_TABLE_"
+#define TC_SEGMENT_INFO_TYPE struct aarch64_segment_info_type

 /* This is not really an alignment operation, but it's something we
    need to do at the same time: whenever we are figuring out the
    alignment for data, we should check whether a $d symbol is
    necessary.  */
-# define md_cons_align(nbytes) mapping_state (MAP_DATA)
+#define md_cons_align(nbytes) mapping_state (MAP_DATA)

 enum mstate
 {
@@ -242,10 +245,6 @@  struct aarch64_segment_info_type
 extern void aarch64_after_parse_args (void);
 #define md_after_parse_args() aarch64_after_parse_args ()

-#else /* Not OBJ_ELF.  */
-#define GLOBAL_OFFSET_TABLE_NAME "__GLOBAL_OFFSET_TABLE_"
-#endif
-
 #if defined OBJ_ELF || defined OBJ_COFF

 # define EXTERN_FORCE_RELOC 1
@@ -259,6 +258,7 @@  extern void aarch64_after_parse_args (void);

 extern void aarch64_frag_align_code (int, int);
 extern const char * elf64_aarch64_target_format (void);
+extern const char * coff_aarch64_target_format (void);
 extern int aarch64_force_relocation (struct fix *);
 extern void aarch64_cleanup (void);
 extern void aarch64_start_line_hook (void);
@@ -274,13 +274,4 @@  extern void aarch64_handle_align (struct frag *);
 extern int tc_aarch64_regname_to_dw2regnum (char *regname);
 extern void tc_aarch64_frame_initial_instructions (void);

-#ifdef TE_PE
-
-#define O_secrel O_md1
-
-#define TC_DWARF2_EMIT_OFFSET  tc_pe_dwarf2_emit_offset
-void tc_pe_dwarf2_emit_offset (symbolS *, unsigned int);
-
-#endif /* TE_PE */
-
 #endif /* TC_AARCH64 */
diff --git a/gas/config/te-pepaarch64.h b/gas/config/te-pepaarch64.h
new file mode 100644
index 00000000000..5983c7642cc
--- /dev/null
+++ b/gas/config/te-pepaarch64.h
@@ -0,0 +1,29 @@ 
+/* Copyright (C) 2006-2021 Free Software Foundation, Inc.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 3,
+   or (at your option) any later version.
+
+   GAS is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+   the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+#define TE_PEP
+#define COFF_WITH_peAArch64
+
+#define TE_PE
+#define LEX_AT (LEX_BEGIN_NAME | LEX_NAME) /* Can have @'s inside labels.  */
+
+/* The PE format supports long section names.  */
+#define COFF_LONG_SECTION_NAMES
+
+#include "obj-format.h"
diff --git a/gas/configure.tgt b/gas/configure.tgt
index d3db3aa9e88..008ad1884b3 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -134,6 +134,7 @@  case ${generic_target} in
       aarch64*-linux-gnu_ilp32) arch=aarch64:32 ;;
     esac ;;
   aarch64*-*-netbsd*) fmt=elf em=nbsd;;
+  aarch64*-*-pe*)       fmt=coff em=pepaarch64 ;;

   alpha-*-*vms*) fmt=evax ;;
   alpha-*-osf*) fmt=ecoff ;;
diff --git a/gas/testsuite/gas/pe/pe-aarch64.d b/gas/testsuite/gas/pe/pe-aarch64.d
new file mode 100644
index 00000000000..8ddc5849535
--- /dev/null
+++ b/gas/testsuite/gas/pe/pe-aarch64.d
@@ -0,0 +1,15 @@ 
+#as:
+#objdump: -d
+
+.*:     file format pe-aarch64-little
+
+
+Disassembly of section .text:
+
+0000000000000000 <_start>:
+   0: d2800281 mov x1, #0x14                   // #20
+   4: 14000001 b 8 <foo>
+
+0000000000000008 <foo>:
+   8: d65f03c0 ret
+
diff --git a/gas/testsuite/gas/pe/pe-aarch64.s b/gas/testsuite/gas/pe/pe-aarch64.s
new file mode 100644
index 00000000000..546d55fc361
--- /dev/null
+++ b/gas/testsuite/gas/pe/pe-aarch64.s
@@ -0,0 +1,11 @@ 
+# A little test to ensure pe-aarch64 is working in GAS.
+# Currently, the poor pe-aarch64 implementation in binutils
+# couldn't do anything useful, hence, this test is rather short
+
+.section .text
+
+_start:
+    mov x1, 20
+    b foo
+foo:
+    ret
diff --git a/gas/testsuite/gas/pe/pe.exp b/gas/testsuite/gas/pe/pe.exp
index c7acb6d78b8..9cdc1d51401 100644
--- a/gas/testsuite/gas/pe/pe.exp
+++ b/gas/testsuite/gas/pe/pe.exp
@@ -52,8 +52,12 @@  if ([istarget "x86_64-*-mingw*"]) then {
  run_dump_test "peseh-x64-6"
 }

-# Big obj
+# This test is only for AArch64
+if ([istarget "aarch64-*-pe*"]) {
+ run_dump_test "pe-aarch64"
+}

+# Big obj

 if ([istarget "*-*-mingw*"]) then {
  run_dump_test "big-obj"
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 90b406f140e..99ccb09b062 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -371,7 +371,9 @@  read_pe_exported_syms (minimal_symbol_reader &reader,
   section_data[PE_SECTION_INDEX_BSS].section_name = ".bss";

   is_pe64 = (strcmp (target, "pe-x86-64") == 0
-     || strcmp (target, "pei-x86-64") == 0);
+     || strcmp (target, "pei-x86-64") == 0
+       || strcmp (target, "pe-aarch64") == 0
+       || strcmp (target, "pei-aarch64") == 0;
   is_pe32 = (strcmp (target, "pe-i386") == 0
      || strcmp (target, "pei-i386") == 0
      || strcmp (target, "pe-arm-wince-little") == 0
@@ -643,7 +645,9 @@  pe_text_section_offset (struct bfd *abfd)
   target = bfd_get_target (abfd);

   is_pe64 = (strcmp (target, "pe-x86-64") == 0
-     || strcmp (target, "pei-x86-64") == 0);
+     || strcmp (target, "pei-x86-64") == 0)
+       || strcmp (target, "pe-aarch64")
+       || strcmp (target, "pei-aarch64");
   is_pe32 = (strcmp (target, "pe-i386") == 0
      || strcmp (target, "pei-i386") == 0
      || strcmp (target, "pe-arm-wince-little") == 0
diff --git a/ld/ChangeLog b/ld/ChangeLog
index a0ab861bb4a..282abc35f80 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,23 @@ 
+2021-12-30  Jedidah Thompson  <wej22007@outlook.com>
+
+    Makefile.am:             Add eaarch64pe.c to source files
+    Makefile.in:             Regenerate
+    configure.tgt:           Add aarch64-pe target, change x86_64-pe target
+                         to use pep-dll-x86_64.c instead of pep-dll.c
+    emulparams/aarch64pe.sh: Create as emulation script
+    emultempl/pep.em:        Define COFF_WITH_peAArch64 when targeting
+                         aarch64pe emulation, ensure coff/aarch64.h gets
+                             included
+    pe-dll.c:                Change pe_use_x86_64 macro the pe_use_plus,
+                         add pe-aarch64-little DLL target, create DLL
+                             import sub for pe-aarch64-little
+    pep-dll-aarch64.c:       Create as small wrapper over pep-dll.c that
+                             specifies that aarch64 is the PEP target
+    pep-dll-x86_64.c:        Create as small wrapper over pep-dll.c that
+                             specifies that x86_64 is the PEP target
+    pep-dll.c:               Don't assume that x86_64 is the only PEP target
+    configure:               Regenerate
+
 2021-12-16  Nick Clifton  <nickc@redhat.com>

  PR 28686
diff --git a/ld/Makefile.am b/ld/Makefile.am
index d27d9956af8..fd8daf48264 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -391,6 +391,7 @@  ALL_64_EMULATION_SOURCES = \
  eaarch64linux32.c \
  eaarch64linux32b.c \
  eaarch64linuxb.c \
+ eaarch64pe.c \
  eelf32_x86_64.c \
  eelf32b4300.c \
  eelf32bmip.c \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index d159f14823f..f659ffe2881 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -522,6 +522,7 @@  pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -880,6 +881,7 @@  ALL_64_EMULATION_SOURCES = \
  eaarch64linux32.c \
  eaarch64linux32b.c \
  eaarch64linuxb.c \
+ eaarch64pe.c \
  eelf32_x86_64.c \
  eelf32b4300.c \
  eelf32bmip.c \
@@ -1255,6 +1257,7 @@  distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linuxb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64pe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaix5ppc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaix5rs6.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaixppc.Po@am__quote@
diff --git a/ld/NEWS b/ld/NEWS
index 33dc02deef2..dde5f3ca821 100644
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -1,5 +1,9 @@ 
 -*- text -*-

+* Add support for PE / COFF objects on AArch64
+
+* Some basic work on DLLs for AArch64.
+
 * Add support for the LoongArch architecture.

 * Add -z indirect-extern-access/-z noindirect-extern-access to x86 ELF
diff --git a/ld/configure b/ld/configure
index c4ba49082cd..f9e98a52bea 100755
--- a/ld/configure
+++ b/ld/configure
@@ -791,6 +791,7 @@  infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -898,6 +899,7 @@  datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1150,6 +1152,15 @@  do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1287,7 +1298,7 @@  fi
 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
  datadir sysconfdir sharedstatedir localstatedir includedir \
  oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1440,6 +1451,7 @@  Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -11452,7 +11464,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11455 "configure"
+#line 11467 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -11558,7 +11570,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11561 "configure"
+#line 11573 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -14992,7 +15004,7 @@  else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -15038,7 +15050,7 @@  else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -15062,7 +15074,7 @@  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -15107,7 +15119,7 @@  else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -15131,7 +15143,7 @@  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
        && LARGE_OFF_T % 2147483647 == 1)
       ? 1 : -1];
@@ -16559,6 +16571,8 @@  main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 925ce076179..8ee3c53645a 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -80,6 +80,10 @@  aarch64-*-linux*) targ_emul=aarch64linux
 aarch64-*-haiku*) targ_emul=aarch64haiku
  targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b aarch64elfb armelf armelfb armelf_haiku $targ_extra_libpath"
  ;;
+aarch64-*-pe*)
+ targ_emul=aarch64pe
+ targ_extra_ofiles="deffilep.o pep-dll-aarch64.o"
+ ;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
  targ_emul=elf64alpha_fbsd
  targ_extra_emuls="elf64alpha alpha"
@@ -1005,7 +1009,7 @@  x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
  ;;
 x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ;
  targ_extra_emuls=i386pe ;
- targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o"
+ targ_extra_ofiles="deffilep.o pep-dll-x86_64.o pe-dll.o"
  ;;
 x86_64-*-cygwin) targ_emul=i386pep ;
  targ_extra_emuls=i386pe
diff --git a/ld/emulparams/aarch64pe.sh b/ld/emulparams/aarch64pe.sh
new file mode 100644
index 00000000000..a72e1e04c55
--- /dev/null
+++ b/ld/emulparams/aarch64pe.sh
@@ -0,0 +1,9 @@ 
+ARCH="aarch64"
+SCRIPT_NAME=pep
+OUTPUT_FORMAT="pei-aarch64-little"
+RELOCATEABLE_OUTPUT_FORMAT="pe-aarch64-little"
+TEMPLATE_NAME=pep
+SUBSYSTEM=PE_DEF_SUBSYSTEM
+INITIAL_SYMBOL_CHAR=\"_\"
+TARGET_PAGE_SIZE=0x1000
+GENERATE_AUTO_IMPORT_SCRIPT=1
\ No newline at end of file
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index 430351b6481..15c3cda9392 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -48,7 +48,11 @@  fragment <<EOF

 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
+#ifdef TARGET_IS_aarch64pe
+#define COFF_WITH_peAArch64
+#elif defined (TARGET_IS_i386pep)
 #define COFF_WITH_pex64
+#endif

 #include "sysdep.h"
 #include "bfd.h"
@@ -72,7 +76,11 @@  fragment <<EOF

 /* FIXME: See bfd/peXXigen.c for why we include an architecture specific
    header in generic PE code.  */
+#ifdef TARGET_IS_i386pep
 #include "coff/x86_64.h"
+#elif defined (TARGET_IS_aarch64pe)
+#include "coff/aarch64.h"
+#endif
 #include "coff/pe.h"

 /* FIXME: These are BFD internal header files, and we should not be
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index e7b82ba6ffa..b83b4f5d70b 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -42,7 +42,7 @@ 
 #include "../bfd/libcoff.h"
 #include "deffile.h"

-#ifdef pe_use_x86_64
+#ifdef pe_use_plus

 #define PE_IDATA4_SIZE 8
 #define PE_IDATA5_SIZE 8
@@ -209,7 +209,7 @@  static const autofilter_entry_type autofilter_symbollist_i386[] =
   { STRING_COMMA_LEN ("_NULL_IMPORT_DESCRIPTOR") },
   /* Entry point symbols, and entry hooks.  */
   { STRING_COMMA_LEN ("cygwin_crt0") },
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
   { STRING_COMMA_LEN ("DllMain") },
   { STRING_COMMA_LEN ("DllEntryPoint") },
   { STRING_COMMA_LEN ("DllMainCRTStartup") },
@@ -246,13 +246,14 @@  static const autofilter_entry_type autofilter_symbollist_i386[] =
 #define PE_ARCH_mips 3
 #define PE_ARCH_arm 4
 #define PE_ARCH_arm_wince 5
+#define PE_ARCH_aarch64   6

 /* Don't make it constant as underscore mode gets possibly overriden
    by target or -(no-)leading-underscore option.  */
 static pe_details_type pe_detail_list[] =
 {
   {
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
     "pei-x86-64",
     "pe-x86-64",
     3 /* R_IMAGEBASE */,
@@ -263,14 +264,14 @@  static pe_details_type pe_detail_list[] =
 #endif
     PE_ARCH_i386,
     bfd_arch_i386,
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
     false,
 #else
     true,
 #endif
     autofilter_symbollist_i386
   },
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
   {
     "pei-x86-64",
     "pe-bigobj-x86-64",
@@ -327,6 +328,15 @@  static pe_details_type pe_detail_list[] =
     false,
     autofilter_symbollist_generic
   },
+  {
+    "pei-aarch64-little",
+    "pe-aarch64-little",
+    2,  /* ARM64_RVA32 */
+    PE_ARCH_aarch64,
+    bfd_arch_aarch64,
+    false,
+    autofilter_symbollist_generic
+  },
   { NULL, NULL, 0, 0, 0, false, NULL }
 };

@@ -1641,7 +1651,7 @@  generate_reloc (bfd *abfd, struct bfd_link_info *info)
   switch BITS_AND_SHIFT (relocs[i]->howto->bitsize,
  relocs[i]->howto->rightshift)
     {
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
     case BITS_AND_SHIFT (64, 0):
       reloc_data[total_relocs].type = 10;
       total_relocs++;
@@ -2278,6 +2288,15 @@  static const unsigned char jmp_arm_bytes[] =
   0,    0,    0,    0
 };

+/* _function:
+  b <__imp_function>
+  nop */
+static const unsigned char jmp_aarch64_bytes[] =
+{
+  0x00, 0x00, 0x00, 0x14,
+  0x1f, 0x20, 0x03, 0xD5
+};
+

 static bfd *
 make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub)
@@ -2317,6 +2336,10 @@  make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub)
   jmp_bytes = jmp_arm_bytes;
   jmp_byte_count = sizeof (jmp_arm_bytes);
   break;
+  case PE_ARCH_aarch64:
+    jmp_bytes = jmp_aarch64_bytes;
+    jmp_byte_count = sizeof (jmp_aarch64_bytes);
+    break;
  default:
   abort ();
  }
@@ -2382,7 +2405,7 @@  make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub)
       switch (pe_details->pe_arch)
  {
  case PE_ARCH_i386:
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
   quick_reloc (abfd, 2, BFD_RELOC_32_PCREL, 2);
 #else
   /* Mark this object as SAFESEH compatible.  */
@@ -2403,6 +2426,9 @@  make_one (def_file_export *exp, bfd *parent, bool include_jmp_stub)
  case PE_ARCH_arm_wince:
   quick_reloc (abfd, 8, BFD_RELOC_32, 2);
   break;
+  case PE_ARCH_aarch64:
+    quick_reloc (abfd, 0, BFD_RELOC_32_PCREL, 2);
+    break;
  default:
   abort ();
  }
@@ -3374,7 +3400,7 @@  pe_implied_import_dll (const char *filename)
   /* Get pe_header, optional header and numbers of directory entries.  */
   pe_header_offset = pe_get32 (dll, 0x3c);
   opthdr_ofs = pe_header_offset + 4 + 20;
-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
   num_entries = pe_get32 (dll, opthdr_ofs + 92 + 4 * 4); /*  & NumberOfRvaAndSizes.  */
 #else
   num_entries = pe_get32 (dll, opthdr_ofs + 92);
@@ -3384,7 +3410,7 @@  pe_implied_import_dll (const char *filename)
   if (num_entries < 1)
     return false;

-#ifdef pe_use_x86_64
+#ifdef pe_use_plus
   export_rva  = pe_get32 (dll, opthdr_ofs + 96 + 4 * 4);
   export_size = pe_get32 (dll, opthdr_ofs + 100 + 4 * 4);
 #else
diff --git a/ld/pep-dll-aarch64.c b/ld/pep-dll-aarch64.c
new file mode 100644
index 00000000000..51fd2be5112
--- /dev/null
+++ b/ld/pep-dll-aarch64.c
@@ -0,0 +1,23 @@ 
+/* Tiny wrapper over pep-dll.c
+   Copyright (C) 2006-2021 Free Software Foundation, Inc.
+
+   This file is part of the GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define COFF_WITH_peAArch64
+
+#include "pep-dll.c"
\ No newline at end of file
diff --git a/ld/pep-dll-x86_64.c b/ld/pep-dll-x86_64.c
new file mode 100644
index 00000000000..7473892ad23
--- /dev/null
+++ b/ld/pep-dll-x86_64.c
@@ -0,0 +1,22 @@ 
+/* Tiny wrapper over pep-dll.c
+   Copyright (C) 2006-2021 Free Software Foundation, Inc.
+   This file is part of the GNU Binutils.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+#define COFF_WITH_pex64
+
+#include "pep-dll.c"
\ No newline at end of file
diff --git a/ld/pep-dll.c b/ld/pep-dll.c
index 8564fb995b9..c19a48d5ecb 100644
--- a/ld/pep-dll.c
+++ b/ld/pep-dll.c
@@ -21,7 +21,6 @@ 

 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
-#define COFF_WITH_pex64

 /* Local defined globals.  */
 #define pe_def_file            pep_def_file
@@ -58,7 +57,7 @@ 
 #define pe_output_file_set_long_section_names \
     pep_output_file_set_long_section_names

-/* Uses x86_64 PE+.  */
-#define pe_use_x86_64
+/* Uses PE+.  */
+#define pe_use_plus

 #include "pe-dll.c"
diff --git a/ld/testsuite/ld-pe/pe-aarch64.d b/ld/testsuite/ld-pe/pe-aarch64.d
new file mode 100644
index 00000000000..fac02b5fd87
--- /dev/null
+++ b/ld/testsuite/ld-pe/pe-aarch64.d
@@ -0,0 +1,16 @@ 
+#ld:
+#objdump: -d
+
+.*:     file format pei-aarch64-little
+
+
+Disassembly of section .text:
+
+0000000140001000 <__rt_psrelocs_end>:
+   140001000: d2800281 mov x1, #0x14                   // #20
+   140001004: 14000001 b 140001008 <foo>
+
+0000000140001008 <foo>:
+   140001008: d65f03c0 ret
+   14000100c: 00000000 udf #0
+#...
diff --git a/ld/testsuite/ld-pe/pe-aarch64.s b/ld/testsuite/ld-pe/pe-aarch64.s
new file mode 100644
index 00000000000..538a8ff7351
--- /dev/null
+++ b/ld/testsuite/ld-pe/pe-aarch64.s
@@ -0,0 +1,13 @@ 
+# A little test to ensure pe-aarch64 is working in LD.
+# Currently, the poor pe-aarch64 implementation in binutils
+# couldn't do anything useful, hence, this test is rather short
+
+.section .text
+
+_start:
+    mov x1, 20
+    b foo
+foo:
+    ret
+
+
diff --git a/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
index a536b51c3e6..4eab8be9775 100644
--- a/ld/testsuite/ld-pe/pe.exp
+++ b/ld/testsuite/ld-pe/pe.exp
@@ -63,6 +63,10 @@  if {[istarget i*86-*-cygwin*]
     run_ld_link_tests $pe_tests
 }

+if {[istarget "aarch64-*-pe*"]} {
+ run_dump_test "pe-aarch64"
+}
+
 run_dump_test "image_size"
 run_dump_test "export_dynamic_warning"