Blame SOURCES/binutils-AArch64-EFI.patch

9007cd
diff -rup binutils.orig/bfd/.gitignore binutils-2.35.2/bfd/.gitignore
9007cd
--- binutils.orig/bfd/.gitignore	2021-11-30 13:38:24.349744247 +0000
9007cd
+++ binutils-2.35.2/bfd/.gitignore	2021-11-30 13:38:37.236657064 +0000
9007cd
@@ -11,6 +11,7 @@
9007cd
 /peigen.c
9007cd
 /pepigen.c
9007cd
 /pex64igen.c
9007cd
+/pe-aarch64igen.c
9007cd
 /stmp-bfd-h
9007cd
 /targmatch.h
9007cd
 
9007cd
diff -rup binutils.orig/bfd/Makefile.am binutils-2.35.2/bfd/Makefile.am
9007cd
--- binutils.orig/bfd/Makefile.am	2021-11-30 13:38:24.358744186 +0000
9007cd
+++ binutils-2.35.2/bfd/Makefile.am	2021-11-30 13:38:37.237657058 +0000
9007cd
@@ -571,7 +571,9 @@ BFD64_BACKENDS = \
9007cd
 	mach-o-aarch64.lo \
9007cd
 	mach-o-x86-64.lo \
9007cd
 	mmo.lo \
9007cd
+	pe-aarch64igen.lo \
9007cd
 	pe-x86_64.lo \
9007cd
+	pei-aarch64lo \
9007cd
 	pei-ia64.lo \
9007cd
 	pei-x86_64.lo \
9007cd
 	pepigen.lo \
9007cd
@@ -611,6 +613,7 @@ BFD64_BACKENDS_CFILES = \
9007cd
 	mach-o-x86-64.c \
9007cd
 	mmo.c \
9007cd
 	pe-x86_64.c \
9007cd
+	pei-aarch64.c \
9007cd
 	pei-ia64.c \
9007cd
 	pei-x86_64.c \
9007cd
 	vms-alpha.c
9007cd
@@ -670,7 +673,7 @@ BUILD_CFILES = \
9007cd
 	elf32-aarch64.c elf64-aarch64.c \
9007cd
 	elf32-ia64.c elf64-ia64.c \
9007cd
 	elf32-riscv.c elf64-riscv.c \
9007cd
-	peigen.c pepigen.c pex64igen.c
9007cd
+	peigen.c pepigen.c pex64igen.c pe-aarch64igen.c
9007cd
 
9007cd
 CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
9007cd
 
9007cd
@@ -866,6 +869,10 @@ pex64igen.c: peXXigen.c
9007cd
 	echo "#line 1 \"peXXigen.c\"" > $@
9007cd
 	$(SED) -e s/XX/pex64/g < $< >> $@
9007cd
 
9007cd
+pe-aarch64igen.c: peXXigen.c
9007cd
+	echo "#line 1 \"peXXigen.c\"" > $@
9007cd
+	$(SED) -e s/XX/peAArch64/g < $< >> $@
9007cd
+
9007cd
 BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h
9007cd
 LOCAL_H_DEPS= libbfd.h sysdep.h config.h bfd_stdint.h
9007cd
 $(BFD32_LIBS) \
9007cd
diff -rup binutils.orig/bfd/Makefile.in binutils-2.35.2/bfd/Makefile.in
9007cd
--- binutils.orig/bfd/Makefile.in	2021-11-30 13:38:24.346744267 +0000
9007cd
+++ binutils-2.35.2/bfd/Makefile.in	2021-11-30 13:38:37.238657051 +0000
9007cd
@@ -997,7 +997,9 @@ BFD64_BACKENDS = \
9007cd
 	mach-o-aarch64.lo \
9007cd
 	mach-o-x86-64.lo \
9007cd
 	mmo.lo \
9007cd
+	pe-aarch64igen.lo \
9007cd
 	pe-x86_64.lo \
9007cd
+	pei-aarch64.lo \
9007cd
 	pei-ia64.lo \
9007cd
 	pei-x86_64.lo \
9007cd
 	pepigen.lo \
9007cd
@@ -1037,6 +1039,7 @@ BFD64_BACKENDS_CFILES = \
9007cd
 	mach-o-x86-64.c \
9007cd
 	mmo.c \
9007cd
 	pe-x86_64.c \
9007cd
+	pei-aarch64.c \
9007cd
 	pei-ia64.c \
9007cd
 	pei-x86_64.c \
9007cd
 	vms-alpha.c
9007cd
@@ -1095,7 +1098,7 @@ BUILD_CFILES = \
9007cd
 	elf32-aarch64.c elf64-aarch64.c \
9007cd
 	elf32-ia64.c elf64-ia64.c \
9007cd
 	elf32-riscv.c elf64-riscv.c \
9007cd
-	peigen.c pepigen.c pex64igen.c
9007cd
+	peigen.c pepigen.c pex64igen.c pe-aarch64igen.c
9007cd
 
9007cd
 CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
9007cd
 SOURCE_HFILES = \
9007cd
@@ -1556,9 +1559,11 @@ distclean-compile:
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-ppc.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-sh.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-x86_64.Plo@am__quote@
9007cd
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-aarch64.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peigen.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pepigen.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pex64igen.Plo@am__quote@
9007cd
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-aarch64igen.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppcboot.Plo@am__quote@
9007cd
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc.Plo@am__quote@
9007cd
@@ -1996,6 +2001,11 @@ pepigen.c : peXXigen.c
9007cd
 pex64igen.c: peXXigen.c
9007cd
 	echo "#line 1 \"peXXigen.c\"" > $@
9007cd
 	$(SED) -e s/XX/pex64/g < $< >> $@
9007cd
+
9007cd
+pe-aarch64igen.c: peXXigen.c
9007cd
+	echo "#line 1 \"peXXigen.c\"" > $@
9007cd
+	$(SED) -e s/XX/peAArch64/g < $< >> $@
9007cd
+
9007cd
 $(BFD32_LIBS) \
9007cd
  $(BFD64_LIBS) \
9007cd
  $(ALL_MACHINES) \
9007cd
diff -rup binutils.orig/bfd/bfd.c binutils-2.35.2/bfd/bfd.c
9007cd
--- binutils.orig/bfd/bfd.c	2021-11-30 13:38:24.344744281 +0000
9007cd
+++ binutils-2.35.2/bfd/bfd.c	2021-11-30 13:38:37.239657044 +0000
9007cd
@@ -1747,6 +1747,7 @@ bfd_get_sign_extend_vma (bfd *abfd)
9007cd
       || strcmp (name, "pei-i386") == 0
9007cd
       || strcmp (name, "pe-x86-64") == 0
9007cd
       || strcmp (name, "pei-x86-64") == 0
9007cd
+      || strcmp (name, "pei-aarch64-little") == 0
9007cd
       || strcmp (name, "pe-arm-wince-little") == 0
9007cd
       || strcmp (name, "pei-arm-wince-little") == 0
9007cd
       || strcmp (name, "aixcoff-rs6000") == 0
9007cd
diff -rup binutils.orig/bfd/coffcode.h binutils-2.35.2/bfd/coffcode.h
9007cd
--- binutils.orig/bfd/coffcode.h	2021-11-30 13:38:24.345744274 +0000
9007cd
+++ binutils-2.35.2/bfd/coffcode.h	2021-11-30 13:38:37.242657024 +0000
9007cd
@@ -2195,6 +2195,12 @@ coff_set_arch_mach_hook (bfd *abfd, void
9007cd
 	}
9007cd
       break;
9007cd
 #endif
9007cd
+#ifdef AARCH64MAGIC
9007cd
+    case AARCH64MAGIC:
9007cd
+      arch = bfd_arch_aarch64;
9007cd
+      machine = internal_f->f_flags & F_AARCH64_ARCHITECTURE_MASK;
9007cd
+      break;
9007cd
+#endif
9007cd
 #ifdef Z80MAGIC
9007cd
     case Z80MAGIC:
9007cd
       arch = bfd_arch_z80;
9007cd
@@ -2751,6 +2757,12 @@ coff_set_flags (bfd * abfd,
9007cd
       return TRUE;
9007cd
 #endif
9007cd
 
9007cd
+#ifdef AARCH64MAGIC
9007cd
+    case bfd_arch_aarch64:
9007cd
+      * magicp = AARCH64MAGIC;
9007cd
+      return TRUE;
9007cd
+#endif
9007cd
+
9007cd
 #ifdef ARMMAGIC
9007cd
     case bfd_arch_arm:
9007cd
 #ifdef ARM_WINCE
9007cd
@@ -3841,7 +3853,7 @@ coff_write_object_contents (bfd * abfd)
9007cd
     internal_f.f_flags |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
9007cd
 #endif
9007cd
 
9007cd
-#ifndef COFF_WITH_pex64
9007cd
+#if !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
 #ifdef COFF_WITH_PE
9007cd
   internal_f.f_flags |= IMAGE_FILE_32BIT_MACHINE;
9007cd
 #else
9007cd
@@ -3895,6 +3907,11 @@ coff_write_object_contents (bfd * abfd)
9007cd
     internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
9007cd
 #endif
9007cd
 
9007cd
+#if defined(AARCH64)
9007cd
+#define __A_MAGIC_SET__
9007cd
+    internal_a.magic = ZMAGIC;
9007cd
+#endif
9007cd
+
9007cd
 #if defined MCORE_PE
9007cd
 #define __A_MAGIC_SET__
9007cd
     internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
9007cd
diff -rup binutils.orig/bfd/config.bfd binutils-2.35.2/bfd/config.bfd
9007cd
--- binutils.orig/bfd/config.bfd	2021-11-30 13:38:24.358744186 +0000
9007cd
+++ binutils-2.35.2/bfd/config.bfd	2021-11-30 13:41:24.512525484 +0000
9007cd
@@ -256,12 +256,12 @@ case "${targ}" in
9007cd
     ;;
9007cd
   aarch64-*-linux*)
9007cd
     targ_defvec=aarch64_elf64_le_vec
9007cd
-    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
9007cd
+    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"
9007cd
     want64=true
9007cd
     ;;
9007cd
   aarch64_be-*-linux*)
9007cd
     targ_defvec=aarch64_elf64_be_vec
9007cd
-    targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
9007cd
+    targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec aarch64_pei_vec"
9007cd
     want64=true
9007cd
     ;;
9007cd
   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
9007cd
diff -rup binutils.orig/bfd/configure binutils-2.35.2/bfd/configure
9007cd
--- binutils.orig/bfd/configure	2021-11-30 13:38:24.358744186 +0000
9007cd
+++ binutils-2.35.2/bfd/configure	2021-11-30 13:38:37.250656970 +0000
9007cd
@@ -14738,6 +14738,7 @@ do
9007cd
     aarch64_elf64_le_vec)	   tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
9007cd
     aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
9007cd
     aarch64_mach_o_vec)		 tb="$tb mach-o-aarch64.lo"; target_size=64 ;;
9007cd
+    aarch64_pei_vec)		 tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
9007cd
     alpha_ecoff_le_vec)		 tb="$tb coff-alpha.lo ecoff.lo $ecoff"; target_size=64 ;;
9007cd
     alpha_elf64_vec)		 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
9007cd
     alpha_elf64_fbsd_vec)	 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
9007cd
diff -rup binutils.orig/bfd/configure.ac binutils-2.35.2/bfd/configure.ac
9007cd
--- binutils.orig/bfd/configure.ac	2021-11-30 13:38:24.354744213 +0000
9007cd
+++ binutils-2.35.2/bfd/configure.ac	2021-11-30 13:38:37.251656963 +0000
9007cd
@@ -450,6 +450,7 @@ do
9007cd
     aarch64_elf64_le_vec)	   tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
9007cd
     aarch64_elf64_le_cloudabi_vec) tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
9007cd
     aarch64_mach_o_vec)		 tb="$tb mach-o-aarch64.lo"; target_size=64 ;;
9007cd
+    aarch64_pei_vec)		 tb="$tb pei-aarch64.lo pe-aarch64igen.lo $coff"; target_size=64 ;;
9007cd
     alpha_ecoff_le_vec)		 tb="$tb coff-alpha.lo ecoff.lo $ecoff"; target_size=64 ;;
9007cd
     alpha_elf64_vec)		 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
9007cd
     alpha_elf64_fbsd_vec)	 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
9007cd
diff -rup binutils.orig/bfd/libpei.h binutils-2.35.2/bfd/libpei.h
9007cd
--- binutils.orig/bfd/libpei.h	2021-11-30 13:38:24.355744206 +0000
9007cd
+++ binutils-2.35.2/bfd/libpei.h	2021-11-30 13:41:57.744300692 +0000
9007cd
@@ -275,6 +275,41 @@
9007cd
 #define _bfd_XXi_write_codeview_record			_bfd_pepi_write_codeview_record
9007cd
 #define _bfd_XXi_slurp_codeview_record			_bfd_pepi_slurp_codeview_record
9007cd
 
9007cd
+#elif defined COFF_WITH_peAArch64
9007cd
+
9007cd
+#define GET_OPTHDR_IMAGE_BASE		 H_GET_64
9007cd
+#define PUT_OPTHDR_IMAGE_BASE		 H_PUT_64
9007cd
+#define GET_OPTHDR_SIZE_OF_STACK_RESERVE H_GET_64
9007cd
+#define PUT_OPTHDR_SIZE_OF_STACK_RESERVE H_PUT_64
9007cd
+#define GET_OPTHDR_SIZE_OF_STACK_COMMIT	 H_GET_64
9007cd
+#define PUT_OPTHDR_SIZE_OF_STACK_COMMIT	 H_PUT_64
9007cd
+#define GET_OPTHDR_SIZE_OF_HEAP_RESERVE	 H_GET_64
9007cd
+#define PUT_OPTHDR_SIZE_OF_HEAP_RESERVE	 H_PUT_64
9007cd
+#define GET_OPTHDR_SIZE_OF_HEAP_COMMIT	 H_GET_64
9007cd
+#define PUT_OPTHDR_SIZE_OF_HEAP_COMMIT	 H_PUT_64
9007cd
+#define GET_PDATA_ENTRY			 bfd_get_32
9007cd
+
9007cd
+#define _bfd_XX_bfd_copy_private_bfd_data_common	_bfd_peAArch64_bfd_copy_private_bfd_data_common
9007cd
+#define _bfd_XX_bfd_copy_private_section_data		_bfd_peAArch64_bfd_copy_private_section_data
9007cd
+#define _bfd_XX_get_symbol_info				_bfd_peAArch64_get_symbol_info
9007cd
+#define _bfd_XX_only_swap_filehdr_out			_bfd_peAArch64_only_swap_filehdr_out
9007cd
+#define _bfd_XX_print_private_bfd_data_common		_bfd_peAArch64_print_private_bfd_data_common
9007cd
+#define _bfd_XXi_final_link_postscript			_bfd_peAArch64i_final_link_postscript
9007cd
+#define _bfd_XXi_only_swap_filehdr_out			_bfd_peAArch64i_only_swap_filehdr_out
9007cd
+#define _bfd_XXi_swap_aouthdr_in			_bfd_peAArch64i_swap_aouthdr_in
9007cd
+#define _bfd_XXi_swap_aouthdr_out			_bfd_peAArch64i_swap_aouthdr_out
9007cd
+#define _bfd_XXi_swap_aux_in				_bfd_peAArch64i_swap_aux_in
9007cd
+#define _bfd_XXi_swap_aux_out				_bfd_peAArch64i_swap_aux_out
9007cd
+#define _bfd_XXi_swap_lineno_in				_bfd_peAArch64i_swap_lineno_in
9007cd
+#define _bfd_XXi_swap_lineno_out			_bfd_peAArch64i_swap_lineno_out
9007cd
+#define _bfd_XXi_swap_scnhdr_out			_bfd_peAArch64i_swap_scnhdr_out
9007cd
+#define _bfd_XXi_swap_sym_in				_bfd_peAArch64i_swap_sym_in
9007cd
+#define _bfd_XXi_swap_sym_out				_bfd_peAArch64i_swap_sym_out
9007cd
+#define _bfd_XXi_swap_debugdir_in			_bfd_peAArch64i_swap_debugdir_in
9007cd
+#define _bfd_XXi_swap_debugdir_out			_bfd_peAArch64i_swap_debugdir_out
9007cd
+#define _bfd_XXi_write_codeview_record			_bfd_peAArch64i_write_codeview_record
9007cd
+#define _bfd_XXi_slurp_codeview_record			_bfd_peAArch64i_slurp_codeview_record
9007cd
+
9007cd
 #else /* !COFF_WITH_pep */
9007cd
 
9007cd
 #define GET_OPTHDR_IMAGE_BASE H_GET_32
9007cd
@@ -368,4 +403,5 @@ bfd_boolean _bfd_pe_print_ce_compressed_
9007cd
 bfd_boolean _bfd_pe64_print_ce_compressed_pdata (bfd *, void *);
9007cd
 bfd_boolean _bfd_pex64_print_ce_compressed_pdata (bfd *, void *);
9007cd
 bfd_boolean _bfd_pep_print_ce_compressed_pdata (bfd *, void *);
9007cd
+bfd_boolean _bfd_peAArch64_print_ce_compressed_pdata (bfd *, void *);
9007cd
 
9007cd
diff -rup binutils.orig/bfd/peXXigen.c binutils-2.35.2/bfd/peXXigen.c
9007cd
--- binutils.orig/bfd/peXXigen.c	2021-11-30 13:38:24.352744227 +0000
9007cd
+++ binutils-2.35.2/bfd/peXXigen.c	2021-11-30 13:38:37.255656936 +0000
9007cd
@@ -60,8 +60,9 @@
9007cd
    on this code has a chance of getting something accomplished without
9007cd
    wasting too much time.  */
9007cd
 
9007cd
-/* This expands into COFF_WITH_pe, COFF_WITH_pep, or COFF_WITH_pex64
9007cd
-   depending on whether we're compiling for straight PE or PE+.  */
9007cd
+/* This expands into COFF_WITH_pe, COFF_WITH_pep, COFF_WITH_pex64 or
9007cd
+   COFF_WITH_peAArch64 depending on whether we're compiling for straight
9007cd
+   PE or PE+.  */
9007cd
 #define COFF_WITH_XX
9007cd
 
9007cd
 #include "sysdep.h"
9007cd
@@ -87,6 +88,8 @@
9007cd
 # include "coff/x86_64.h"
9007cd
 #elif defined COFF_WITH_pep
9007cd
 # include "coff/ia64.h"
9007cd
+#elif defined COFF_WITH_peAArch64
9007cd
+# include "coff/aarch64.h"
9007cd
 #else
9007cd
 # include "coff/i386.h"
9007cd
 #endif
9007cd
@@ -96,7 +99,7 @@
9007cd
 #include "libpei.h"
9007cd
 #include "safe-ctype.h"
9007cd
 
9007cd
-#if defined COFF_WITH_pep || defined COFF_WITH_pex64
9007cd
+#if defined COFF_WITH_pep || defined COFF_WITH_pex64 || defined COFF_WITH_peAArch64
9007cd
 # undef AOUTSZ
9007cd
 # define AOUTSZ		PEPAOUTSZ
9007cd
 # define PEAOUTHDR	PEPAOUTHDR
9007cd
@@ -485,7 +488,7 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
9007cd
   aouthdr_int->text_start =
9007cd
     GET_AOUTHDR_TEXT_START (abfd, aouthdr_ext->text_start);
9007cd
 
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
   /* PE32+ does not have data_start member!  */
9007cd
   aouthdr_int->data_start =
9007cd
     GET_AOUTHDR_DATA_START (abfd, aouthdr_ext->data_start);
9007cd
@@ -571,7 +574,7 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
9007cd
   if (aouthdr_int->entry)
9007cd
     {
9007cd
       aouthdr_int->entry += a->ImageBase;
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       aouthdr_int->entry &= 0xffffffff;
9007cd
 #endif
9007cd
     }
9007cd
@@ -579,12 +582,12 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd,
9007cd
   if (aouthdr_int->tsize)
9007cd
     {
9007cd
       aouthdr_int->text_start += a->ImageBase;
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       aouthdr_int->text_start &= 0xffffffff;
9007cd
 #endif
9007cd
     }
9007cd
 
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
   /* PE32+ does not have data_start member!  */
9007cd
   if (aouthdr_int->dsize)
9007cd
     {
9007cd
@@ -653,7 +656,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
9007cd
   if (aouthdr_in->tsize)
9007cd
     {
9007cd
       aouthdr_in->text_start -= ib;
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       aouthdr_in->text_start &= 0xffffffff;
9007cd
 #endif
9007cd
     }
9007cd
@@ -661,7 +664,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
9007cd
   if (aouthdr_in->dsize)
9007cd
     {
9007cd
       aouthdr_in->data_start -= ib;
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       aouthdr_in->data_start &= 0xffffffff;
9007cd
 #endif
9007cd
     }
9007cd
@@ -669,7 +672,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
9007cd
   if (aouthdr_in->entry)
9007cd
     {
9007cd
       aouthdr_in->entry -= ib;
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       aouthdr_in->entry &= 0xffffffff;
9007cd
 #endif
9007cd
     }
9007cd
@@ -773,7 +776,7 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, v
9007cd
   PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
9007cd
 			  aouthdr_out->standard.text_start);
9007cd
 
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
   /* PE32+ does not have data_start member!  */
9007cd
   PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
9007cd
 			  aouthdr_out->standard.data_start);
9007cd
@@ -1886,7 +1889,7 @@ pe_print_edata (bfd * abfd, void * vfile
9007cd
 static bfd_boolean
9007cd
 pe_print_pdata (bfd * abfd, void * vfile)
9007cd
 {
9007cd
-#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
 # define PDATA_ROW_SIZE	(3 * 8)
9007cd
 #else
9007cd
 # define PDATA_ROW_SIZE	(5 * 4)
9007cd
@@ -1913,7 +1916,7 @@ pe_print_pdata (bfd * abfd, void * vfile
9007cd
 
9007cd
   fprintf (file,
9007cd
 	   _("\nThe Function Table (interpreted .pdata section contents)\n"));
9007cd
-#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
   fprintf (file,
9007cd
 	   _(" vma:\t\t\tBegin Address    End Address      Unwind Info\n"));
9007cd
 #else
9007cd
@@ -1950,7 +1953,7 @@ pe_print_pdata (bfd * abfd, void * vfile
9007cd
       bfd_vma eh_handler;
9007cd
       bfd_vma eh_data;
9007cd
       bfd_vma prolog_end_addr;
9007cd
-#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
9007cd
       int em_data;
9007cd
 #endif
9007cd
 
9007cd
@@ -1968,7 +1971,7 @@ pe_print_pdata (bfd * abfd, void * vfile
9007cd
 	/* We are probably into the padding of the section now.  */
9007cd
 	break;
9007cd
 
9007cd
-#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
9007cd
       em_data = ((eh_handler & 0x1) << 2) | (prolog_end_addr & 0x3);
9007cd
 #endif
9007cd
       eh_handler &= ~(bfd_vma) 0x3;
9007cd
@@ -1979,7 +1982,7 @@ pe_print_pdata (bfd * abfd, void * vfile
9007cd
       bfd_fprintf_vma (abfd, file, begin_addr); fputc (' ', file);
9007cd
       bfd_fprintf_vma (abfd, file, end_addr); fputc (' ', file);
9007cd
       bfd_fprintf_vma (abfd, file, eh_handler);
9007cd
-#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) || defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
9007cd
       fputc (' ', file);
9007cd
       bfd_fprintf_vma (abfd, file, eh_data); fputc (' ', file);
9007cd
       bfd_fprintf_vma (abfd, file, prolog_end_addr);
9007cd
@@ -2894,7 +2897,7 @@ _bfd_XX_print_private_bfd_data_common (b
9007cd
   bfd_fprintf_vma (abfd, file, i->AddressOfEntryPoint);
9007cd
   fprintf (file, "\nBaseOfCode\t\t");
9007cd
   bfd_fprintf_vma (abfd, file, i->BaseOfCode);
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
   /* PE32+ does not have BaseOfData member!  */
9007cd
   fprintf (file, "\nBaseOfData\t\t");
9007cd
   bfd_fprintf_vma (abfd, file, i->BaseOfData);
9007cd
@@ -3163,7 +3166,7 @@ _bfd_XX_get_symbol_info (bfd * abfd, asy
9007cd
   coff_get_symbol_info (abfd, symbol, ret);
9007cd
 }
9007cd
 
9007cd
-#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64) && defined(COFF_WITH_peAArch64)
9007cd
 static int
9007cd
 sort_x64_pdata (const void *l, const void *r)
9007cd
 {
9007cd
@@ -4595,7 +4598,7 @@ _bfd_XXi_final_link_postscript (bfd * ab
9007cd
 	the TLS data directory consists of 4 pointers, followed
9007cd
 	by two 4-byte integer. This implies that the total size
9007cd
 	is different for 32-bit and 64-bit executables.  */
9007cd
-#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x18;
9007cd
 #else
9007cd
       pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x28;
9007cd
@@ -4604,7 +4607,7 @@ _bfd_XXi_final_link_postscript (bfd * ab
9007cd
 
9007cd
 /* If there is a .pdata section and we have linked pdata finally, we
9007cd
      need to sort the entries ascending.  */
9007cd
-#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64)
9007cd
+#if !defined(COFF_WITH_pep) && defined(COFF_WITH_pex64) && defined(COFF_WITH_peAArch64)
9007cd
   {
9007cd
     asection *sec = bfd_get_section_by_name (abfd, ".pdata");
9007cd
 
9007cd
Only in binutils-2.35.2/bfd: pei-aarch64.c
9007cd
diff -rup binutils.orig/bfd/peicode.h binutils-2.35.2/bfd/peicode.h
9007cd
--- binutils.orig/bfd/peicode.h	2021-11-30 13:38:24.354744213 +0000
9007cd
+++ binutils-2.35.2/bfd/peicode.h	2021-11-30 13:38:37.256656929 +0000
9007cd
@@ -231,7 +231,7 @@ coff_swap_scnhdr_in (bfd * abfd, void *
9007cd
     {
9007cd
       scnhdr_int->s_vaddr += pe_data (abfd)->pe_opthdr.ImageBase;
9007cd
       /* Do not cut upper 32-bits for 64-bit vma.  */
9007cd
-#ifndef COFF_WITH_pex64
9007cd
+#if !defined(COFF_WITH_pex64) && !defined(COFF_WITH_peAArch64)
9007cd
       scnhdr_int->s_vaddr &= 0xffffffff;
9007cd
 #endif
9007cd
     }
9007cd
@@ -738,6 +738,16 @@ static jump_table jtab[] =
9007cd
   },
9007cd
 #endif
9007cd
 
9007cd
+#ifdef AARCH64MAGIC
9007cd
+/* We don't currently support jumping to DLLs, so if
9007cd
+   someone does try emit a runtime trap.  Through UDF #0.  */
9007cd
+  { AARCH64MAGIC,
9007cd
+    { 0x00, 0x00, 0x00, 0x00 },
9007cd
+    4, 0
9007cd
+  },
9007cd
+
9007cd
+#endif
9007cd
+
9007cd
 #ifdef  ARMPEMAGIC
9007cd
   { ARMPEMAGIC,
9007cd
     { 0x00, 0xc0, 0x9f, 0xe5, 0x00, 0xf0,
9007cd
@@ -910,7 +920,7 @@ pe_ILF_build_a_bfd (bfd *	    abfd,
9007cd
 	/* See PR 20907 for a reproducer.  */
9007cd
 	goto error_return;
9007cd
 
9007cd
-#ifdef COFF_WITH_pex64
9007cd
+#if defined(COFF_WITH_pex64) || defined(COFF_WITH_peAArch64)
9007cd
       ((unsigned int *) id4->contents)[0] = ordinal;
9007cd
       ((unsigned int *) id4->contents)[1] = 0x80000000;
9007cd
       ((unsigned int *) id5->contents)[0] = ordinal;
9007cd
@@ -1206,6 +1216,12 @@ pe_ILF_object_p (bfd * abfd)
9007cd
 #endif
9007cd
       break;
9007cd
 
9007cd
+    case IMAGE_FILE_MACHINE_ARM64:
9007cd
+#ifdef AARCH64MAGIC
9007cd
+      magic = AARCH64MAGIC;
9007cd
+#endif
9007cd
+      break;
9007cd
+
9007cd
     case IMAGE_FILE_MACHINE_THUMB:
9007cd
 #ifdef THUMBPEMAGIC
9007cd
       {
9007cd
diff -rup binutils.orig/bfd/targets.c binutils-2.35.2/bfd/targets.c
9007cd
--- binutils.orig/bfd/targets.c	2021-11-30 13:38:24.354744213 +0000
9007cd
+++ binutils-2.35.2/bfd/targets.c	2021-11-30 13:38:37.257656922 +0000
9007cd
@@ -668,6 +668,7 @@ extern const bfd_target aarch64_elf64_be
9007cd
 extern const bfd_target aarch64_elf64_le_vec;
9007cd
 extern const bfd_target aarch64_elf64_le_cloudabi_vec;
9007cd
 extern const bfd_target aarch64_mach_o_vec;
9007cd
+extern const bfd_target aarch64_pei_vec;
9007cd
 extern const bfd_target alpha_ecoff_le_vec;
9007cd
 extern const bfd_target alpha_elf64_vec;
9007cd
 extern const bfd_target alpha_elf64_fbsd_vec;
9007cd
@@ -983,6 +984,7 @@ static const bfd_target * const _bfd_tar
9007cd
 	&aarch64_elf64_le_vec,
9007cd
 	&aarch64_elf64_le_cloudabi_vec,
9007cd
 	&aarch64_mach_o_vec,
9007cd
+	&aarch64_pei_vec,
9007cd
 #endif
9007cd
 
9007cd
 #ifdef BFD64
9007cd
diff -rup binutils.orig/binutils/NEWS binutils-2.35.2/binutils/NEWS
9007cd
--- binutils.orig/binutils/NEWS	2021-11-30 13:38:23.874747460 +0000
9007cd
+++ binutils-2.35.2/binutils/NEWS	2021-11-30 13:42:31.024075560 +0000
9007cd
@@ -1,5 +1,8 @@
9007cd
 -*- text -*-
9007cd
 
9007cd
+* Support for efi-app-aarch64, efi-rtdrv-aarch64 and efi-bsdrv-aarch64 has been
9007cd
+  added to objcopy in order to enable UEFI development using binutils.
9007cd
+
9007cd
 Changes in 2.35:
9007cd
 
9007cd
 * Changed readelf's display of symbol names when wide mode is not enabled.
9007cd
diff -rup binutils.orig/binutils/objcopy.c binutils-2.35.2/binutils/objcopy.c
9007cd
--- binutils.orig/binutils/objcopy.c	2021-11-30 13:38:23.874747460 +0000
9007cd
+++ binutils-2.35.2/binutils/objcopy.c	2021-11-30 13:38:37.260656902 +0000
9007cd
@@ -4950,6 +4950,13 @@ convert_efi_target (char *efi)
9007cd
       /* Change x86_64 to x86-64.  */
9007cd
       efi[7] = '-';
9007cd
     }
9007cd
+  else if (strcmp (efi + 4, "aarch64") == 0)
9007cd
+    {
9007cd
+      /* Change aarch64 to aarch64-little.  */
9007cd
+      efi = (char *) xrealloc (efi, strlen (efi) + 7);
9007cd
+      char *t = "aarch64-little";
9007cd
+      strcpy (efi + 4, t);
9007cd
+    }
9007cd
 }
9007cd
 
9007cd
 /* Allocate and return a pointer to a struct section_add, initializing the
9007cd
diff -rup binutils.orig/include/coff/pe.h binutils-2.35.2/include/coff/pe.h
9007cd
--- binutils.orig/include/coff/pe.h	2021-11-30 13:38:23.827747778 +0000
9007cd
+++ binutils-2.35.2/include/coff/pe.h	2021-11-30 13:38:37.261656895 +0000
9007cd
@@ -132,6 +132,7 @@
9007cd
 #define IMAGE_FILE_MACHINE_AM33              0x01d3
9007cd
 #define IMAGE_FILE_MACHINE_AMD64             0x8664
9007cd
 #define IMAGE_FILE_MACHINE_ARM               0x01c0
9007cd
+#define IMAGE_FILE_MACHINE_ARM64             0xaa64
9007cd
 #define IMAGE_FILE_MACHINE_AXP64             IMAGE_FILE_MACHINE_ALPHA64
9007cd
 #define IMAGE_FILE_MACHINE_CEE               0xc0ee
9007cd
 #define IMAGE_FILE_MACHINE_CEF               0x0cef
9007cd
--- /dev/null	2021-11-30 07:48:35.901044247 +0000
9007cd
+++ binutils-2.35.2/bfd/coff-aarch64.c	2021-11-30 13:43:11.774799879 +0000
9007cd
@@ -0,0 +1,165 @@
9007cd
+/* BFD back-end for AArch64 COFF files.
9007cd
+   Copyright (C) 2021 Free Software Foundation, Inc.
9007cd
+
9007cd
+   This file is part of BFD, the Binary File Descriptor library.
9007cd
+
9007cd
+   This program is free software; you can redistribute it and/or modify
9007cd
+   it under the terms of the GNU General Public License as published by
9007cd
+   the Free Software Foundation; either version 3 of the License, or
9007cd
+   (at your option) any later version.
9007cd
+
9007cd
+   This program is distributed in the hope that it will be useful,
9007cd
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
9007cd
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9007cd
+   GNU General Public License for more details.
9007cd
+
9007cd
+   You should have received a copy of the GNU General Public License
9007cd
+   along with this program; if not, write to the Free Software
9007cd
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
9007cd
+   MA 02110-1301, USA.  */
9007cd
+
9007cd
+
9007cd
+#ifndef COFF_WITH_peAArch64
9007cd
+#define COFF_WITH_peAArch64
9007cd
+#endif
9007cd
+
9007cd
+/* Note we have to make sure not to include headers twice.
9007cd
+   Not all headers are wrapped in #ifdef guards, so we define
9007cd
+   PEI_HEADERS to prevent double including here.  */
9007cd
+#ifndef PEI_HEADERS
9007cd
+#include "sysdep.h"
9007cd
+#include "bfd.h"
9007cd
+#include "libbfd.h"
9007cd
+#include "coff/aarch64.h"
9007cd
+#include "coff/internal.h"
9007cd
+#include "coff/pe.h"
9007cd
+#include "libcoff.h"
9007cd
+#include "libiberty.h"
9007cd
+#endif
9007cd
+
9007cd
+#include "libcoff.h"
9007cd
+
9007cd
+/* The page size is a guess based on ELF.  */
9007cd
+
9007cd
+#define COFF_PAGE_SIZE 0x1000
9007cd
+
9007cd
+/* All users of this file have bfd_octets_per_byte (abfd, sec) == 1.  */
9007cd
+#define OCTETS_PER_BYTE(ABFD, SEC) 1
9007cd
+
9007cd
+#ifndef PCRELOFFSET
9007cd
+#define PCRELOFFSET TRUE
9007cd
+#endif
9007cd
+
9007cd
+/* Currently we don't handle any relocations.  */
9007cd
+static reloc_howto_type pe_aarch64_std_reloc_howto[] =
9007cd
+  {
9007cd
+
9007cd
+  };
9007cd
+
9007cd
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER  2
9007cd
+#define COFF_PAGE_SIZE			      0x1000
9007cd
+
9007cd
+#ifndef NUM_ELEM
9007cd
+#define NUM_ELEM(a) ((sizeof (a)) / sizeof ((a)[0]))
9007cd
+#endif
9007cd
+
9007cd
+#define NUM_RELOCS NUM_ELEM (pe_aarch64_std_reloc_howto)
9007cd
+
9007cd
+#define RTYPE2HOWTO(cache_ptr, dst)             \
9007cd
+  (cache_ptr)->howto = NULL
9007cd
+
9007cd
+#ifndef bfd_pe_print_pdata
9007cd
+#define bfd_pe_print_pdata      NULL
9007cd
+#endif
9007cd
+
9007cd
+/* Return TRUE if this relocation should
9007cd
+   appear in the output .reloc section.  */
9007cd
+
9007cd
+static bfd_boolean
9007cd
+in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED,
9007cd
+            reloc_howto_type * howto)
9007cd
+{
9007cd
+  return !howto->pc_relative;
9007cd
+}
9007cd
+
9007cd
+#include "coffcode.h"
9007cd
+
9007cd
+/* Target vectors.  */
9007cd
+const bfd_target
9007cd
+#ifdef TARGET_SYM
9007cd
+  TARGET_SYM =
9007cd
+#else
9007cd
+  aarch64_pei_vec =
9007cd
+#endif
9007cd
+{
9007cd
+#ifdef TARGET_NAME
9007cd
+  TARGET_NAME,
9007cd
+#else
9007cd
+ "pei-aarch64-little",			/* Name.  */
9007cd
+#endif
9007cd
+  bfd_target_coff_flavour,
9007cd
+  BFD_ENDIAN_LITTLE,		/* Data byte order is little.  */
9007cd
+  BFD_ENDIAN_LITTLE,		/* Header byte order is little.  */
9007cd
+
9007cd
+  (HAS_RELOC | EXEC_P		/* Object flags.  */
9007cd
+   | HAS_LINENO | HAS_DEBUG
9007cd
+   | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED | BFD_COMPRESS | BFD_DECOMPRESS),
9007cd
+
9007cd
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* Section flags.  */
9007cd
+#if defined(COFF_WITH_PE)
9007cd
+   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES | SEC_READONLY | SEC_DEBUGGING
9007cd
+#endif
9007cd
+   | SEC_CODE | SEC_DATA | SEC_EXCLUDE ),
9007cd
+
9007cd
+#ifdef TARGET_UNDERSCORE
9007cd
+  TARGET_UNDERSCORE,		/* Leading underscore.  */
9007cd
+#else
9007cd
+  0,				/* Leading underscore.  */
9007cd
+#endif
9007cd
+  '/',				/* Ar_pad_char.  */
9007cd
+  15,				/* Ar_max_namelen.  */
9007cd
+  0,				/* match priority.  */
9007cd
+
9007cd
+     /* Data conversion functions.  */
9007cd
+     bfd_getl64, bfd_getl_signed_64, bfd_putl64,
9007cd
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
9007cd
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Data.  */
9007cd
+     /* Header conversion functions.  */
9007cd
+     bfd_getl64, bfd_getl_signed_64, bfd_putl64,
9007cd
+     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
9007cd
+     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Hdrs.  */
9007cd
+
9007cd
+  /* Note that we allow an object file to be treated as a core file as well.  */
9007cd
+  {				/* bfd_check_format.  */
9007cd
+    _bfd_dummy_target,
9007cd
+    coff_object_p,
9007cd
+    bfd_generic_archive_p,
9007cd
+    coff_object_p
9007cd
+  },
9007cd
+  {				/* bfd_set_format.  */
9007cd
+    _bfd_bool_bfd_false_error,
9007cd
+    coff_mkobject,
9007cd
+    _bfd_generic_mkarchive,
9007cd
+    _bfd_bool_bfd_false_error
9007cd
+  },
9007cd
+  {				/* bfd_write_contents.  */
9007cd
+    _bfd_bool_bfd_false_error,
9007cd
+    coff_write_object_contents,
9007cd
+    _bfd_write_archive_contents,
9007cd
+    _bfd_bool_bfd_false_error
9007cd
+  },
9007cd
+
9007cd
+  BFD_JUMP_TABLE_GENERIC (coff),
9007cd
+  BFD_JUMP_TABLE_COPY (coff),
9007cd
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),
9007cd
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
9007cd
+  BFD_JUMP_TABLE_SYMBOLS (coff),
9007cd
+  BFD_JUMP_TABLE_RELOCS (coff),
9007cd
+  BFD_JUMP_TABLE_WRITE (coff),
9007cd
+  BFD_JUMP_TABLE_LINK (coff),
9007cd
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
9007cd
+
9007cd
+  NULL,
9007cd
+
9007cd
+  COFF_SWAP_TABLE
9007cd
+};
9007cd
--- /dev/null	2021-11-30 07:48:35.901044247 +0000
9007cd
+++ binutils-2.35.2/include/coff/aarch64.h	2021-11-30 13:38:37.261656895 +0000
9007cd
@@ -0,0 +1,63 @@
9007cd
+/* AArch64 COFF support for BFD.
9007cd
+   Copyright (C) 2021 Free Software Foundation, Inc.
9007cd
+
9007cd
+   This file is part of BFD, the Binary File Descriptor library.
9007cd
+
9007cd
+   This program is free software; you can redistribute it and/or modify
9007cd
+   it under the terms of the GNU General Public License as published by
9007cd
+   the Free Software Foundation; either version 3 of the License, or
9007cd
+   (at your option) any later version.
9007cd
+
9007cd
+   This program is distributed in the hope that it will be useful,
9007cd
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
9007cd
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9007cd
+   GNU General Public License for more details.
9007cd
+
9007cd
+   You should have received a copy of the GNU General Public License
9007cd
+   along with this program; if not, write to the Free Software Foundation,
9007cd
+   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
9007cd
+
9007cd
+#define COFFAARCH64 1
9007cd
+
9007cd
+#define L_LNNO_SIZE 2
9007cd
+#define INCLUDE_COMDAT_FIELDS_IN_AUXENT
9007cd
+#include "coff/external.h"
9007cd
+
9007cd
+#define F_AARCH64_ARCHITECTURE_MASK	(0x4000)
9007cd
+
9007cd
+#define	AARCH64MAGIC	0xaa64  /* From Microsoft specification. */
9007cd
+
9007cd
+#undef  BADMAG
9007cd
+#define BADMAG(x) ((x).f_magic != AARCH64MAGIC)
9007cd
+#define AARCH64         1                 /* Customize coffcode.h.  */
9007cd
+
9007cd
+#define IMAGE_NT_OPTIONAL_HDR64_MAGIC      0x20b
9007cd
+
9007cd
+#define OMAGIC          0404    /* Object files, eg as output.  */
9007cd
+#define ZMAGIC          IMAGE_NT_OPTIONAL_HDR64_MAGIC    /* Demand load format, eg normal ld output 0x10b.  */
9007cd
+#define STMAGIC		0401	/* Target shlib.  */
9007cd
+#define SHMAGIC		0443	/* Host   shlib.  */
9007cd
+
9007cd
+/* define some NT default values */
9007cd
+/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
9007cd
+#define NT_SECTION_ALIGNMENT 0x1000
9007cd
+#define NT_FILE_ALIGNMENT    0x200
9007cd
+#define NT_DEF_RESERVE       0x100000
9007cd
+#define NT_DEF_COMMIT        0x1000
9007cd
+
9007cd
+/* We use the .rdata section to hold read only data.  */
9007cd
+#define _LIT	".rdata"
9007cd
+
9007cd
+/********************** RELOCATION DIRECTIVES **********************/
9007cd
+struct external_reloc
9007cd
+{
9007cd
+  char r_vaddr[4];
9007cd
+  char r_symndx[4];
9007cd
+  char r_type[2];
9007cd
+  char r_offset[4];
9007cd
+};
9007cd
+
9007cd
+#define RELOC struct external_reloc
9007cd
+#define RELSZ 14
9007cd
+
9007cd
+#define ARM_NOTE_SECTION ".note"
9007cd
--- /dev/null	2021-11-30 07:48:35.901044247 +0000
9007cd
+++ binutils-2.35.2/binutils/testsuite/binutils-all/aarch64/pei-aarch64-little.s	2021-11-30 13:38:37.260656902 +0000
9007cd
@@ -0,0 +1,42 @@
9007cd
+	.arch armv8-a
9007cd
+	.text
9007cd
+	.align	2
9007cd
+	.global	foo
9007cd
+	.type	foo, %function
9007cd
+foo:
9007cd
+.LFB0:
9007cd
+	.cfi_startproc
9007cd
+	sub	sp, sp, #16
9007cd
+	.cfi_def_cfa_offset 16
9007cd
+	str	w0, [sp, 12]
9007cd
+	ldr	w0, [sp, 12]
9007cd
+	mul	w0, w0, w0
9007cd
+	add	sp, sp, 16
9007cd
+	.cfi_def_cfa_offset 0
9007cd
+	ret
9007cd
+	.cfi_endproc
9007cd
+.LFE0:
9007cd
+	.size	foo, .-foo
9007cd
+	.align	2
9007cd
+	.global	main
9007cd
+	.type	main, %function
9007cd
+main:
9007cd
+.LFB1:
9007cd
+	.cfi_startproc
9007cd
+	stp	x29, x30, [sp, -16]!
9007cd
+	.cfi_def_cfa_offset 16
9007cd
+	.cfi_offset 29, -16
9007cd
+	.cfi_offset 30, -8
9007cd
+	mov	x29, sp
9007cd
+	mov	w0, 5
9007cd
+	bl	foo
9007cd
+	ldp	x29, x30, [sp], 16
9007cd
+	.cfi_restore 30
9007cd
+	.cfi_restore 29
9007cd
+	.cfi_def_cfa_offset 0
9007cd
+	ret
9007cd
+	.cfi_endproc
9007cd
+.LFE1:
9007cd
+	.size	main, .-main
9007cd
+	.ident	"GCC: (fsf-trunk.2870) 12.0.0 20210930 (experimental)"
9007cd
+	.section	.note.GNU-stack,"",@progbits
9007cd
--- /dev/null	2021-11-30 07:48:35.901044247 +0000
9007cd
+++ binutils-2.35.2/binutils/testsuite/binutils-all/aarch64/pei-aarch64-little.d	2021-11-30 13:38:37.260656902 +0000
9007cd
@@ -0,0 +1,16 @@
9007cd
+#skip: aarch64_be-*-*
9007cd
+#ld: -e0
9007cd
+#PROG: objcopy
9007cd
+#objcopy: -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* -j .reloc --target=efi-app-aarch64
9007cd
+#objdump: -h -f
9007cd
+#name: Check if efi app format is recognized
9007cd
+
9007cd
+.*:     file format pei-aarch64-little
9007cd
+architecture: aarch64, flags 0x00000132:
9007cd
+EXEC_P, HAS_SYMS, HAS_LOCALS, D_PAGED
9007cd
+start address 0x0000000000000000
9007cd
+
9007cd
+Sections:
9007cd
+Idx Name          Size      VMA               LMA               File off  Algn
9007cd
+  0 \.text         00000030  0[^ ]+  0[^ ]+  0[^ ]+  2\*\*2
9007cd
+                  CONTENTS, ALLOC, LOAD, READONLY, CODE
9007cd
--- /dev/null	2021-11-30 07:48:35.901044247 +0000
9007cd
+++ binutils-2.35.2/bfd/pei-aarch64.c	2021-11-30 13:38:37.255656936 +0000
9007cd
@@ -0,0 +1,75 @@
9007cd
+/* BFD back-end for AArch64 PE IMAGE COFF files.
9007cd
+   Copyright (C) 2021 Free Software Foundation, Inc.
9007cd
+
9007cd
+   This file is part of BFD, the Binary File Descriptor library.
9007cd
+
9007cd
+   This program is free software; you can redistribute it and/or modify
9007cd
+   it under the terms of the GNU General Public License as published by
9007cd
+   the Free Software Foundation; either version 3 of the License, or
9007cd
+   (at your option) any later version.
9007cd
+
9007cd
+   This program is distributed in the hope that it will be useful,
9007cd
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
9007cd
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9007cd
+   GNU General Public License for more details.
9007cd
+
9007cd
+   You should have received a copy of the GNU General Public License
9007cd
+   along with this program; if not, write to the Free Software
9007cd
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
9007cd
+   MA 02110-1301, USA.  */
9007cd
+
9007cd
+#include "sysdep.h"
9007cd
+#include "bfd.h"
9007cd
+
9007cd
+#define TARGET_SYM		aarch64_pei_vec
9007cd
+#define TARGET_NAME		"pei-aarch64-little"
9007cd
+#define TARGET_ARCHITECTURE	bfd_arch_aarch64
9007cd
+#define TARGET_PAGESIZE		4096
9007cd
+#define TARGET_BIG_ENDIAN	0
9007cd
+#define TARGET_ARCHIVE		0
9007cd
+#define TARGET_PRIORITY		0
9007cd
+
9007cd
+#define COFF_IMAGE_WITH_PE
9007cd
+/* Rename the above into.. */
9007cd
+#define COFF_WITH_peAArch64
9007cd
+#define COFF_WITH_PE
9007cd
+#define PCRELOFFSET	   TRUE
9007cd
+
9007cd
+/* Long section names not allowed in executable images, only object files.  */
9007cd
+#define COFF_LONG_SECTION_NAMES 0
9007cd
+
9007cd
+#define COFF_SECTION_ALIGNMENT_ENTRIES \
9007cd
+{ COFF_SECTION_NAME_EXACT_MATCH (".bss"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
9007cd
+{ COFF_SECTION_NAME_EXACT_MATCH (".data"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
9007cd
+{ COFF_SECTION_NAME_EXACT_MATCH (".rdata"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
9007cd
+{ COFF_SECTION_NAME_EXACT_MATCH (".text"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
9007cd
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".idata"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
9007cd
+{ COFF_SECTION_NAME_EXACT_MATCH (".pdata"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 2 }, \
9007cd
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".debug"), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }, \
9007cd
+{ COFF_SECTION_NAME_PARTIAL_MATCH (".gnu.linkonce.wi."), \
9007cd
+  COFF_ALIGNMENT_FIELD_EMPTY, COFF_ALIGNMENT_FIELD_EMPTY, 0 }
9007cd
+
9007cd
+#define PEI_HEADERS
9007cd
+#include "sysdep.h"
9007cd
+#include "bfd.h"
9007cd
+#include "libbfd.h"
9007cd
+#include "coff/aarch64.h"
9007cd
+#include "coff/internal.h"
9007cd
+#include "coff/pe.h"
9007cd
+#include "libcoff.h"
9007cd
+#include "libpei.h"
9007cd
+#include "libiberty.h"
9007cd
+
9007cd
+/* Make sure we're setting a 64-bit format.  */
9007cd
+#undef AOUTSZ
9007cd
+#define AOUTSZ          PEPAOUTSZ
9007cd
+#define PEAOUTHDR       PEPAOUTHDR
9007cd
+
9007cd
+#include "coff-aarch64.c"