aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2021-09-07 15:46:31 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2021-09-24 18:16:55 +0100
commit71f965110840291535b1301a65a92c9d586fc7cf (patch)
treeff56b6b28d2b03f09291a8d719144204b682f82a
parent84cccff60a978174271a30042bf7841d2ae436eb (diff)
downloadgcc-71f965110840291535b1301a65a92c9d586fc7cf.zip
gcc-71f965110840291535b1301a65a92c9d586fc7cf.tar.gz
gcc-71f965110840291535b1301a65a92c9d586fc7cf.tar.bz2
top-level: merge Makefile.def patches from binutils-gdb repository
This commit back-ports two patches to Makefile.def from the binutils-gdb repository, these patches were committed over there without first being merged in to the gcc repository. These commits all relate to dependencies for binutils-gdb modules, so should have no impact on gcc, I tested a gcc build/install on x86-64 GNU/Linux, and everything looked OK. The two patches being backported are binutils-gdb commits: commit ba4d88ad892fe29c6ca7938c8861f8edef5f7a3f (gdb-gnulib-issues) Date: Mon Oct 12 16:04:32 2020 +0100 gdb/gdbserver: add dependencies for distclean-gnulib And commit 755ba58ebef02e1be9fc6770d00243ba6ed0223c Date: Thu Mar 18 12:37:52 2021 +0000 Add install dependencies for ld -> bfd and libctf -> bfd 2021-09-07 Andrew Burgess <andrew.burgess@embecosm.com> * Makefile.def: Back-port commits ba4d88ad892f and 755ba58ebef0 from binutils-gdb repository. * Makefile.in: Regenerated.
-rw-r--r--Makefile.def14
-rw-r--r--Makefile.in8
2 files changed, 22 insertions, 0 deletions
diff --git a/Makefile.def b/Makefile.def
index 1bed8c1..e015a7a 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -471,6 +471,14 @@ dependencies = { module=all-ld; on=all-libctf; };
dependencies = { module=install-binutils; on=install-opcodes; };
dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
+// Likewise for ld, libctf, and bfd.
+dependencies = { module=install-libctf; on=install-bfd; };
+dependencies = { module=install-ld; on=install-bfd; };
+dependencies = { module=install-ld; on=install-libctf; };
+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
+
// libopcodes depends on libbfd
dependencies = { module=install-opcodes; on=install-bfd; };
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
@@ -564,6 +572,12 @@ dependencies = { module=configure-libctf; on=all-zlib; };
dependencies = { module=configure-libctf; on=all-libiconv; };
dependencies = { module=check-libctf; on=all-ld; };
+// The Makefiles in gdb and gdbserver pull in a file that configure
+// generates in the gnulib directory, so distclean gnulib only after
+// gdb and gdbserver.
+dependencies = { module=distclean-gnulib; on=distclean-gdb; };
+dependencies = { module=distclean-gnulib; on=distclean-gdbserver; };
+
// Warning, these are not well tested.
dependencies = { module=all-bison; on=all-intl; };
dependencies = { module=all-bison; on=all-build-texinfo; };
diff --git a/Makefile.in b/Makefile.in
index dd63afc..9219ebf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60771,6 +60771,12 @@ all-stageautoprofile-ld: maybe-all-stageautoprofile-libctf
all-stageautofeedback-ld: maybe-all-stageautofeedback-libctf
install-binutils: maybe-install-opcodes
install-strip-binutils: maybe-install-strip-opcodes
+install-libctf: maybe-install-bfd
+install-ld: maybe-install-bfd
+install-ld: maybe-install-libctf
+install-strip-libctf: maybe-install-strip-bfd
+install-strip-ld: maybe-install-strip-bfd
+install-strip-ld: maybe-install-strip-libctf
install-opcodes: maybe-install-bfd
install-strip-opcodes: maybe-install-strip-bfd
configure-gas: maybe-configure-intl
@@ -61139,6 +61145,8 @@ check-stagetrain-libctf: maybe-all-stagetrain-ld
check-stagefeedback-libctf: maybe-all-stagefeedback-ld
check-stageautoprofile-libctf: maybe-all-stageautoprofile-ld
check-stageautofeedback-libctf: maybe-all-stageautofeedback-ld
+distclean-gnulib: maybe-distclean-gdb
+distclean-gnulib: maybe-distclean-gdbserver
all-bison: maybe-all-build-texinfo
all-flex: maybe-all-build-bison
all-flex: maybe-all-m4