Hi! On 2023-10-25T13:06:48+0200, Arthur Cohen <arthur.co...@embecosm.com> wrote: > From: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com> > > Define the libgrust directory as a host compilation module as well as > for targets.
I don't see a response to Richard's comments: <https://inbox.sourceware.org/cafiyyc0pcqfbknt06fammsnrf7ww4kbor6qvetwj++kmup1...@mail.gmail.com>. Re "doesn't build libgrust if [Rust is not enabled]", I suppose (but have not checked) this works for the *target* libgrust module via 'gcc/rust/config-lang.in:target_libs' requesting 'target-libgrust' only if the Rust language is enabled? I don't know what enables/disables the *host* libgrust build? My comments: <https://inbox.sourceware.org/871qek608j....@euler.schwinge.homeip.net> don't seem to have been addressed? Also, don't you first have to get in "build: Regenerate build files" before the 'gcc/rust/config-lang.in:target_libs' change, to avoid breaking bisection? Maybe, after all, don't have a separate "build: Regenerate build files" commit, but instead do the regeneration as part of the commits adding the source files, in usual GCC style? And then, the 'contrib/gcc_update' change that's currently in "libgrust: Add entry for maintainers and stub changelog file" should be part of the commit that actually adds the files referenced therein. Grüße Thomas > ChangeLog: > > * Makefile.def: Add libgrust as host & target module. > * configure.ac: Add libgrust to host tools list. > > gcc/rust/ChangeLog: > > * config-lang.in: Add libgrust as a target module for the rust > language. > > Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com> > --- > Makefile.def | 2 ++ > configure.ac | 3 ++- > gcc/rust/config-lang.in | 2 ++ > 3 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/Makefile.def b/Makefile.def > index 15c068e4ac4..929a6f0a08e 100644 > --- a/Makefile.def > +++ b/Makefile.def > @@ -149,6 +149,7 @@ host_modules= { module= libcc1; > extra_configure_flags=--enable-shared; }; > host_modules= { module= gotools; }; > host_modules= { module= libctf; bootstrap=true; }; > host_modules= { module= libsframe; bootstrap=true; }; > +host_modules= { module= libgrust; }; > > target_modules = { module= libstdc++-v3; > bootstrap=true; > @@ -192,6 +193,7 @@ target_modules = { module= libgm2; lib_path=.libs; }; > target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; > target_modules = { module= libitm; lib_path=.libs; }; > target_modules = { module= libatomic; bootstrap=true; lib_path=.libs; }; > +target_modules = { module= libgrust; }; > > // These are (some of) the make targets to be done in each subdirectory. > // Not all; these are the ones which don't have special options. > diff --git a/configure.ac b/configure.ac > index 692dc716343..b2a5511bab1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -133,7 +133,7 @@ build_tools="build-texinfo build-flex build-bison > build-m4 build-fixincludes" > > # 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 libcody libdecnumber gmp mpfr mpc isl libiconv libctf > libsframe" > +host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib > libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf > libsframe libgrust " > > # these tools are built for the host environment > # Note, the powerpc-eabi build depends on sim occurring before gdb in order > to > @@ -164,6 +164,7 @@ target_libraries="target-libgcc \ > target-libada \ > target-libgm2 \ > target-libgo \ > + target-libgrust \ > target-libphobos \ > target-zlib" > > diff --git a/gcc/rust/config-lang.in b/gcc/rust/config-lang.in > index aac66c9b962..8f071dcb0bf 100644 > --- a/gcc/rust/config-lang.in > +++ b/gcc/rust/config-lang.in > @@ -29,4 +29,6 @@ compilers="rust1\$(exeext)" > > build_by_default="no" > > +target_libs="target-libffi target-libbacktrace target-libgrust" > + > gtfiles="\$(srcdir)/rust/rust-lang.cc" > -- > 2.42.0 ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
