On 29/05/2019 14:46, Richard Biener wrote:
> On Wed, May 29, 2019 at 3:40 PM Nick Clifton <ni...@redhat.com> wrote:
>>
>> Hi Guys,
>>
>> I would like to bring over a few additions that have recently been
>> made to the binutils versions of the Makefile.def and configure.ac
>> files. Any objections ?
>>
>> Note - I did run a toolchain bootstrap after applying this patch
>> locally and that went OK...
>>
>> Cheers
>> Nick
>>
>> ./ChangeLog
>> 2019-05-29 Nick Clifton <ni...@redhat.com>
>>
>> Import from binutils:
>> 2019-05-29 Nick Clifton <ni...@redhat.com>
>>
>> * configure.ac (noconfigdirs): Add libctf if the target does not use
>> the ELF file format.
>> * configure: Regenerate.
>>
>> 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 271737)
>> +++ 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;
>> @@ -137,6 +139,9 @@
>> bootstrap=true;
>> lib_path=.libs;
>> raw_cxx=true; };
>> +target_modules = { module= libmpx;
>> + bootstrap=true;
>> + lib_path=.libs; };
>
> It seems to re-introduce things that have been removed on the
> GCC side.
>
> Please double-check and re-post. (just cherry-pick actual
> changes from the binutils side?)
Is it just that one hunk that's problematic (I can't see any other
non-relevant hunks)? Without this patch, my unified tree builds are all
broken and have been for a week now.
R.
>
> Richard.
>
>> target_modules = { module= libvtv;
>> bootstrap=true;
>> lib_path=.libs;
>> @@ -428,6 +433,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 +524,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 271737)
>> +++ 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
>> @@ -928,7 +934,23 @@
>> ;;
>> esac
>>
>> +# Targets that do not use the ELF file format cannot support libctf.
>> case "${target}" in
>> + *-*-pe | *-*-*vms* | *-*-darwin | *-*-*coff* | *-*-wince | *-*-mingw*)
>> + noconfigdirs="$noconfigdirs libctf"
>> + ;;
>> + *-*-aout | *-*-osf* | *-*-go32 | *-*-macos* | *-*-rhapsody*)
>> + noconfigdirs="$noconfigdirs libctf"
>> + ;;
>> + *-*-netbsdpe | *-*-cygwin* | *-*-pep | *-*-msdos | *-*-winnt)
>> + noconfigdirs="$noconfigdirs libctf"
>> + ;;
>> + ns32k-*-* | pdp11-*-* | *-*-aix* | *-*-netbsdaout)
>> + noconfigdirs="$noconfigdirs libctf"
>> + ;;
>> +esac
>> +
>> +case "${target}" in
>> *-*-chorusos)
>> ;;
>> aarch64-*-darwin*)
