On Mon, Jun 10, 2019 at 11:47 AM Nick Clifton <ni...@redhat.com> wrote: > > Hi Richard, > > OK, here is a resubmission of my patch with just the addition of the > libctf patches this time. (Sorry about the previous bad patch). > Tested with a bootstrap and a normal build. OK to apply ?
Sure. Thanks, Richard. > Cheers > Nick > > 2019-06-07 Nick Clifton <ni...@redhat.com> > > Import these changes from the binutils/gdb repository: > > 2019-05-28 Nick Alcock <nick.alc...@oracle.com> > > * Makefile.def (dependencies): configure-libctf depends on all-bfd > and all its deps. > * Makefile.in: Regenerated. > > 2019-05-28 Nick Alcock <nick.alc...@oracle.com> > > * Makefile.def (host_modules): Add libctf. > * Makefile.def (dependencies): Likewise. > libctf depends on zlib, libiberty, and bfd. > * Makefile.in: Regenerated. > * configure.ac (host_libs): Add libctf. > * configure: Regenerated. > > Index: Makefile.def > =================================================================== > --- Makefile.def (revision 272111) > +++ Makefile.def (working copy) > @@ -4,7 +4,7 @@ > // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'. > // This file was originally written by Nathanael Nerode. > // > -// Copyright 2002-2013 Free Software Foundation > +// Copyright 2002-2019 Free Software Foundation > // > // This file is free software; you can redistribute it and/or modify > // it under the terms of the GNU General Public License as published by > @@ -128,6 +128,8 @@ > extra_make_flags='@extra_linker_plugin_flags@'; }; > host_modules= { module= libcc1; extra_configure_flags=--enable-shared; }; > host_modules= { module= gotools; }; > +host_modules= { module= libctf; no_install=true; no_check=true; > + bootstrap=true; }; > > target_modules = { module= libstdc++-v3; > bootstrap=true; > @@ -428,6 +430,7 @@ > dependencies = { module=all-binutils; on=all-build-bison; }; > dependencies = { module=all-binutils; on=all-intl; }; > dependencies = { module=all-binutils; on=all-gas; }; > +dependencies = { module=all-binutils; on=all-libctf; }; > > // We put install-opcodes before install-binutils because the installed > // binutils might be on PATH, and they might need the shared opcodes > @@ -518,6 +521,14 @@ > dependencies = { module=all-fastjar; on=all-zlib; }; > dependencies = { module=all-fastjar; on=all-build-texinfo; }; > dependencies = { module=all-fastjar; on=all-libiberty; }; > +dependencies = { module=all-libctf; on=all-libiberty; hard=true; }; > +dependencies = { module=all-libctf; on=all-bfd; }; > +dependencies = { module=all-libctf; on=all-zlib; }; > +// So that checking for ELF support in BFD from libctf configure is possible. > +dependencies = { module=configure-libctf; on=all-bfd; }; > +dependencies = { module=configure-libctf; on=all-intl; }; > +dependencies = { module=configure-libctf; on=all-zlib; }; > +dependencies = { module=configure-libctf; on=all-libiconv; }; > > // Warning, these are not well tested. > dependencies = { module=all-bison; on=all-intl; }; > Index: configure.ac > =================================================================== > --- configure.ac (revision 272111) > +++ configure.ac (working copy) > @@ -131,7 +131,7 @@ > > # these libraries are used by various programs built for the host environment > #f > -host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib > libbacktrace libcpp libdecnumber gmp mpfr mpc isl libelf libiconv" > +host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib > libbacktrace libcpp libdecnumber gmp mpfr mpc isl libelf libiconv libctf" > > # these tools are built for the host environment > # Note, the powerpc-eabi build depends on sim occurring before gdb in order > to