From: Alan Modra Date: Thu, 25 Nov 2021 03:56:51 +0000 (+1030) Subject: Re: AArch64: Add support for AArch64 EFI (efi-*-aarch64) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32384aa396e7e87fe02cc838722b8e80ec88ec10;p=binutils-gdb.git Re: AArch64: Add support for AArch64 EFI (efi-*-aarch64) Commit b69c9d41e8 edited bfd/Makefile.in rather than using automake, which meant a typo in Makefile.am was not discovered and other differences in Makefile.in are seen with a proper regeneration. One difference was lack of an empty line between the pe-aarch64igen.c rule and the following $(BFD32_LIBS) etc. dependency rule, in the regenerated file. Not that it matters for proper "make" behaviour, but it's nicer with a line between those rules. Moving the rule earlier seems to cure the missing empty line. * Makefile.am (BFD64_BACKENDS): Correct typo. (BFD_H_DEPS, LOCAL_H_DEPS): Move earlier. Move rule using these deps earlier too. * Makefile.in: Regenerate. * po/BLD-POTFILES.in: Regenerate. * po/SRC-POTFILES.in: Regenerate. --- diff --git a/bfd/Makefile.am b/bfd/Makefile.am index d0798c340ab..86ed7675052 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -574,7 +574,7 @@ BFD64_BACKENDS = \ mmo.lo \ pe-aarch64igen.lo \ pe-x86_64.lo \ - pei-aarch64lo \ + pei-aarch64.lo \ pei-ia64.lo \ pei-x86_64.lo \ pepigen.lo \ @@ -717,6 +717,15 @@ BUILT_SOURCES = $(BUILD_HFILES) HFILES = $(SOURCE_HFILES) $(BUILD_HFILES) +BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h +LOCAL_H_DEPS = libbfd.h sysdep.h config.h +$(BFD32_LIBS) \ + $(BFD64_LIBS) \ + $(ALL_MACHINES) \ + $(BFD32_BACKENDS) \ + $(BFD64_BACKENDS) \ + $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) + SRC_POTFILES = $(SOURCE_CFILES) $(SOURCE_HFILES) BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES) @@ -884,15 +893,6 @@ pe-aarch64igen.c: peXXigen.c echo "#line 1 \"peXXigen.c\"" > $@ $(SED) -e s/XX/peAArch64/g < $< >> $@ -BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h -LOCAL_H_DEPS= libbfd.h sysdep.h config.h -$(BFD32_LIBS) \ - $(BFD64_LIBS) \ - $(ALL_MACHINES) \ - $(BFD32_BACKENDS) \ - $(BFD64_BACKENDS) \ - $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) - host-aout.lo: Makefile # The following program can be used to generate a simple config file diff --git a/bfd/Makefile.in b/bfd/Makefile.in index b9466430be4..47b84f59b03 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1138,6 +1138,8 @@ BUILD_HFILES = \ # Ensure they are built early: BUILT_SOURCES = $(BUILD_HFILES) HFILES = $(SOURCE_HFILES) $(BUILD_HFILES) +BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h +LOCAL_H_DEPS = libbfd.h sysdep.h config.h SRC_POTFILES = $(SOURCE_CFILES) $(SOURCE_HFILES) BLD_POTFILES = $(BUILD_CFILES) $(BUILD_HFILES) @@ -1163,8 +1165,6 @@ libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL) $(ZLIB) # everything else starts using libtool. FIXME. noinst_LIBRARIES = libbfd.a libbfd_a_SOURCES = -BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/diagnostics.h -LOCAL_H_DEPS = libbfd.h sysdep.h config.h BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c \ bfdio.c bfdwin.c section.c archures.c reloc.c \ syms.c bfd.c archive.c corefile.c targets.c format.c \ @@ -1551,6 +1551,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-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@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-i386.Plo@am__quote@ @@ -1558,6 +1559,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-sh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-x86_64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pef.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-aarch64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-arm-wince.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-arm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-i386.Plo@am__quote@ @@ -1565,11 +1567,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-mcore.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-sh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-x86_64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pei-aarch64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peigen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pepigen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pex64igen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pe-aarch64igen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppcboot.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reloc.Plo@am__quote@ @@ -1895,6 +1895,12 @@ uninstall-am: uninstall-bfdincludeHEADERS uninstall-bfdlibLTLIBRARIES .PRECIOUS: Makefile +$(BFD32_LIBS) \ + $(BFD64_LIBS) \ + $(ALL_MACHINES) \ + $(BFD32_BACKENDS) \ + $(BFD64_BACKENDS) \ + $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) po/SRC-POTFILES.in: @MAINT@ Makefile $(SRC_POTFILES) for file in $(SRC_POTFILES); do echo $$file; done \ @@ -2020,13 +2026,6 @@ pe-aarch64igen.c: peXXigen.c echo "#line 1 \"peXXigen.c\"" > $@ $(SED) -e s/XX/peAArch64/g < $< >> $@ -$(BFD32_LIBS) \ - $(BFD64_LIBS) \ - $(ALL_MACHINES) \ - $(BFD32_BACKENDS) \ - $(BFD64_BACKENDS) \ - $(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS) - host-aout.lo: Makefile # The following program can be used to generate a simple config file diff --git a/bfd/po/BLD-POTFILES.in b/bfd/po/BLD-POTFILES.in index 0ecbbcff584..4ce769168fb 100644 --- a/bfd/po/BLD-POTFILES.in +++ b/bfd/po/BLD-POTFILES.in @@ -9,6 +9,7 @@ elf64-ia64.c elf64-loongarch.c elf64-riscv.c elf64-target.h +pe-aarch64igen.c peigen.c pepigen.c pex64igen.c diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index cd412952d63..98bd9db97ad 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -323,6 +323,7 @@ pe-x86_64.c pef-traceback.h pef.c pef.h +pei-aarch64.c pei-arm-wince.c pei-arm.c pei-i386.c