From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id A80223858C27; Tue, 26 Sep 2023 22:42:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A80223858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-CSE-ConnectionGUID: L6/20MX6RDehlMD9JjOx+Q== X-CSE-MsgGUID: UqKYXh0kQMavU7YFv9/qmw== X-IronPort-AV: E=Sophos;i="6.03,179,1694764800"; d="scan'208";a="17900760" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 26 Sep 2023 14:42:15 -0800 IronPort-SDR: xQE9fHnn1GhdWvQfewubtVNAZ/0cC9UgLlA3hpaIAsWzm8PZgflfWpD3ZUmE6CFXspJehjFVvc O5NOVpT2aEZXXbWEk/VTCnkuWdyo9aEqNWpuAJ5uIGMWZYMOYFDvGhJi4ybJaA8FVo2QH/PkI8 aXrr6tW97QNqlG9tCvnsAhcM7PbBPubGqMC0eqk9gT1ZdWVpxthrSUgkt8MrvuozL7gqXE5yC4 kTXfW7ojcY291VtEBvUlHP+il3Cz5fB0PecFSPrW4/tghY84qjqKz+S0q2oAz8DiktTdoy7mWB 5u4= From: Thomas Schwinge To: Richard Biener , Arthur Cohen , Pierre-Emmanuel Patry CC: , Subject: Re: [PATCH 1/3] librust: Add libproc_macro and build system In-Reply-To: References: <20230920120311.14892-1-arthur.cohen@embecosm.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Wed, 27 Sep 2023 00:42:10 +0200 Message-ID: <87wmwc4kvx.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-14.mgc.mentorg.com (139.181.222.14) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,KAM_SHORT,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi! On 2023-09-26T13:40:40+0200, Richard Biener wr= ote: > On Wed, Sep 20, 2023 at 2:04=E2=80=AFPM Arthur Cohen wrote: >> >> From: Pierre-Emmanuel Patry >> >> This patch series adds the build system changes to allow the Rust >> frontend to develop and distribute its own libraries. The first library >> we have been working on is the `proc_macro` library, comprised of a C++ >> library as well as a user-facing Rust library. >> >> Follow up commits containing the actual library code will be committed. >> Should I submit patches to the MAINTAINERS file to allow Philip and I to >> commit to this folder without first approval? > > I think the Rust language frontend maintainership implicitly includes > the rust runtime libraries. Would seem reasonable -- but to make things explicit, may also add in 'MAINTAINERS', 'Various Maintainers' an entry like: libgrust All Rust front end maintainers ..., or similar? Or, explicitly duplicate for all Rust front end maintainers. (We don't seem to be consistent with respect to that.) >> This first commit adds a simple `libgrust` folder with on top of which t= he >> full library will be built. > > OK. Before pushing this, don't you first have to set up an empty 'libgrust/ChangeLog', like commit 24ff0b3e0c41e3997fb4c11736b8a412afbaadf3 "Add stub 'gcc/rust/ChangeLog'", for example? ..., and adjust 'contrib/gcc-changelog/git_commit.py:default_changelog_locations', like commit 325529e21e81fbc3561d2568cb7e8a26296e5b2f "Prepare 'contrib/gcc-changelog/git_commit.py' for GCC/Rust", for example? ..., and then replace your 'libgrust/[...]' Git commit log entries: >> Add some dummy files in libproc_macro along with it's build system. >> >> ChangeLog: >> >> * libgrust/Makefile.am: New file. >> * libgrust/configure.ac: New file. >> * libgrust/libproc_macro/Makefile.am: New file. >> * libgrust/libproc_macro/proc_macro.cc: New file. >> * libgrust/libproc_macro/proc_macro.h: New file. >> >> Signed-off-by: Pierre-Emmanuel Patry ... with: libgrust/ * Makefile.am: New file. [...] (Or similar syntax.) That way, the "nightly" auto-updater will use 'libgrust/ChangeLog' instead of the top-level 'ChangeLog'. (I hope I got all that right.) Please also update 'contrib/gcc_update:files_and_dependencies' for all 'libgrust/' generated files' dependencies. Gr=C3=BC=C3=9Fe Thomas >> --- >> libgrust/Makefile.am | 68 ++++++++++++++++ >> libgrust/configure.ac | 113 +++++++++++++++++++++++++++ >> libgrust/libproc_macro/Makefile.am | 58 ++++++++++++++ >> libgrust/libproc_macro/proc_macro.cc | 7 ++ >> libgrust/libproc_macro/proc_macro.h | 7 ++ >> 5 files changed, 253 insertions(+) >> create mode 100644 libgrust/Makefile.am >> create mode 100644 libgrust/configure.ac >> create mode 100644 libgrust/libproc_macro/Makefile.am >> create mode 100644 libgrust/libproc_macro/proc_macro.cc >> create mode 100644 libgrust/libproc_macro/proc_macro.h >> >> diff --git a/libgrust/Makefile.am b/libgrust/Makefile.am >> new file mode 100644 >> index 00000000000..8e5274922c5 >> --- /dev/null >> +++ b/libgrust/Makefile.am >> @@ -0,0 +1,68 @@ >> +AUTOMAKE_OPTIONS =3D 1.8 foreign >> + >> +SUFFIXES =3D .c .rs .def .o .lo .a >> + >> +ACLOCAL_AMFLAGS =3D -I . -I .. -I ../config >> + >> +AM_CFLAGS =3D -I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/inclu= de >> + >> +TOP_GCCDIR :=3D $(shell cd $(top_srcdir) && cd .. && pwd) >> + >> +GCC_DIR =3D $(TOP_GCCDIR)/gcc >> +RUST_SRC =3D $(GCC_DIR)/rust >> + >> +toolexeclibdir=3D@toolexeclibdir@ >> +toolexecdir=3D@toolexecdir@ >> + >> +SUBDIRS =3D libproc_macro >> + >> +RUST_BUILDDIR :=3D $(shell pwd) >> + >> +# Work around what appears to be a GNU make bug handling MAKEFLAGS >> +# values defined in terms of make variables, as is the case for CC and >> +# friends when we are called from the top level Makefile. >> +AM_MAKEFLAGS =3D \ >> + "GCC_DIR=3D$(GCC_DIR)" \ >> + "RUST_SRC=3D$(RUST_SRC)" \ >> + "AR_FLAGS=3D$(AR_FLAGS)" \ >> + "CC_FOR_BUILD=3D$(CC_FOR_BUILD)" \ >> + "CC_FOR_TARGET=3D$(CC_FOR_TARGET)" \ >> + "RUST_FOR_TARGET=3D$(RUST_FOR_TARGET)" \ >> + "CFLAGS=3D$(CFLAGS)" \ >> + "CXXFLAGS=3D$(CXXFLAGS)" \ >> + "CFLAGS_FOR_BUILD=3D$(CFLAGS_FOR_BUILD)" \ >> + "CFLAGS_FOR_TARGET=3D$(CFLAGS_FOR_TARGET)" \ >> + "INSTALL=3D$(INSTALL)" \ >> + "INSTALL_DATA=3D$(INSTALL_DATA)" \ >> + "INSTALL_PROGRAM=3D$(INSTALL_PROGRAM)" \ >> + "INSTALL_SCRIPT=3D$(INSTALL_SCRIPT)" \ >> + "LDFLAGS=3D$(LDFLAGS)" \ >> + "LIBCFLAGS=3D$(LIBCFLAGS)" \ >> + "LIBCFLAGS_FOR_TARGET=3D$(LIBCFLAGS_FOR_TARGET)" \ >> + "MAKE=3D$(MAKE)" \ >> + "MAKEINFO=3D$(MAKEINFO) $(MAKEINFOFLAGS)" \ >> + "PICFLAG=3D$(PICFLAG)" \ >> + "PICFLAG_FOR_TARGET=3D$(PICFLAG_FOR_TARGET)" \ >> + "SHELL=3D$(SHELL)" \ >> + "RUNTESTFLAGS=3D$(RUNTESTFLAGS)" \ >> + "exec_prefix=3D$(exec_prefix)" \ >> + "infodir=3D$(infodir)" \ >> + "libdir=3D$(libdir)" \ >> + "includedir=3D$(includedir)" \ >> + "prefix=3D$(prefix)" \ >> + "tooldir=3D$(tooldir)" \ >> + "gxx_include_dir=3D$(gxx_include_dir)" \ >> + "AR=3D$(AR)" \ >> + "AS=3D$(AS)" \ >> + "LD=3D$(LD)" \ >> + "RANLIB=3D$(RANLIB)" \ >> + "NM=3D$(NM)" \ >> + "NM_FOR_BUILD=3D$(NM_FOR_BUILD)" \ >> + "NM_FOR_TARGET=3D$(NM_FOR_TARGET)" \ >> + "DESTDIR=3D$(DESTDIR)" \ >> + "WERROR=3D$(WERROR)" \ >> + "TARGET_LIB_PATH=3D$(TARGET_LIB_PATH)" \ >> + "TARGET_LIB_PATH_librust=3D$(TARGET_LIB_PATH_librust)" \ >> + "LIBTOOL=3D$(RUST_BUILDDIR)/libtool" >> + >> +include $(top_srcdir)/../multilib.am >> diff --git a/libgrust/configure.ac b/libgrust/configure.ac >> new file mode 100644 >> index 00000000000..7aed489a643 >> --- /dev/null >> +++ b/libgrust/configure.ac >> @@ -0,0 +1,113 @@ >> +AC_INIT([libgrust], version-unused,,librust) >> +AC_CONFIG_SRCDIR(Makefile.am) >> +AC_CONFIG_FILES([Makefile]) >> + >> +# AM_ENABLE_MULTILIB(, ..) >> + >> +# Do not delete or change the following two lines. For why, see >> +# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html >> +AC_CANONICAL_SYSTEM >> +target_alias=3D${target_alias-$host_alias} >> +AC_SUBST(target_alias) >> + >> +# Automake should never attempt to rebuild configure >> +AM_MAINTAINER_MODE >> + >> +AM_INIT_AUTOMAKE([1.15.1 foreign no-dist -Wall]) >> + >> +# Make sure we don't test executables when making cross-tools. >> +GCC_NO_EXECUTABLES >> + >> + >> +# Add the ability to change LIBTOOL directory >> +GCC_WITH_TOOLEXECLIBDIR >> + >> +# Use system specific extensions >> +AC_USE_SYSTEM_EXTENSIONS >> + >> + >> +# Checks for header files. >> +AC_HEADER_STDC >> +AC_HEADER_SYS_WAIT >> +AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h \ >> + time.h sys/stat.h wchar.h) >> + >> +# Check for tools >> +AM_PROG_AR >> +AC_PROG_CC >> +AC_PROG_CXX >> +AM_PROG_AS >> +AC_PROG_MAKE_SET >> +AC_PROG_INSTALL >> + >> +# Enable libtool >> +LT_INIT >> + >> +# target_noncanonical variables... >> +AC_CANONICAL_HOST >> +ACX_NONCANONICAL_HOST >> +ACX_NONCANONICAL_TARGET >> +GCC_TOPLEV_SUBDIRS >> + >> +AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) >> +AC_ARG_ENABLE(version-specific-runtime-libs, >> +[ --enable-version-specific-runtime-libs Specify that runtime libra= ries should be installed in a compiler-specific directory ], >> +[case "$enableval" in >> + yes) version_specific_libs=3Dyes ;; >> + no) version_specific_libs=3Dno ;; >> + *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific= libs]);; >> + esac], >> +[version_specific_libs=3Dno]) >> +AC_MSG_RESULT($version_specific_libs) >> + >> +toolexecdir=3Dno >> +toolexeclibdir=3Dno >> + >> +# Calculate toolexeclibdir >> +# Also toolexecdir, though it's only used in toolexeclibdir >> +case ${version_specific_libs} in >> + yes) >> + # Need the gcc compiler version to know where to install libraries >> + # and header files if --enable-version-specific-runtime-libs option >> + # is selected. >> + toolexecdir=3D'$(libdir)/gcc/$(target_noncanonical)' >> + toolexeclibdir=3D'$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' >> + ;; >> + no) >> + if test -n "$with_cross_host" && >> + test x"$with_cross_host" !=3D x"no"; then >> + # Install a library built with a cross compiler in tooldir, not l= ibdir. >> + toolexecdir=3D'$(exec_prefix)/$(target_noncanonical)' >> + toolexeclibdir=3D'$(toolexecdir)/lib' >> + else >> + toolexecdir=3D'$(libdir)/gcc-lib/$(target_noncanonical)' >> + toolexeclibdir=3D'$(libdir)' >> + fi >> + multi_os_directory=3D`$CC -print-multi-os-directory` >> + case $multi_os_directory in >> + .) ;; # Avoid trailing /. >> + *) toolexeclibdir=3D$toolexeclibdir/$multi_os_directory ;; >> + esac >> + ;; >> +esac >> + >> +AC_SUBST(toolexecdir) >> +AC_SUBST(toolexeclibdir) >> + >> + >> +AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro], [DIR/Makefile ]), >> + [ cat > vpsed$$ << \_EOF >> +s!`test -f '$<' || echo '$(srcdir)/'`!! >> +_EOF >> + sed -f vpsed$$ $ac_file > tmp$$ >> + mv tmp$$ $ac_file >> + rm vpsed$$ >> + echo 'MULTISUBDIR =3D' >> $ac_file >> + ml_norecursion=3Dyes >> + AS_UNSET([ml_norecursion]) >> +]) >> + >> + >> +AC_MSG_NOTICE([librust has been configured.]) >> + >> +AC_OUTPUT >> diff --git a/libgrust/libproc_macro/Makefile.am b/libgrust/libproc_macro= /Makefile.am >> new file mode 100644 >> index 00000000000..1e61d12e506 >> --- /dev/null >> +++ b/libgrust/libproc_macro/Makefile.am >> @@ -0,0 +1,58 @@ >> +SUFFIXES =3D .cc .o .a .lo .la >> + >> +ACLOCAL_AMFLAGS =3D -I .. -I ../../config >> + >> +toolexeclibdir=3D@toolexeclibdir@ >> +toolexecdir=3D@toolexecdir@ >> + >> +# Work around what appears to be a GNU make bug handling MAKEFLAGS >> +# values defined in terms of make variables, as is the case for CC and >> +# friends when we are called from the top level Makefile. >> +AM_MAKEFLAGS =3D \ >> + "AR_FLAGS=3D$(AR_FLAGS)" \ >> + "CC_FOR_BUILD=3D$(CC_FOR_BUILD)" \ >> + "CC_FOR_TARGET=3D$(CC_FOR_TARGET)" \ >> + "CFLAGS=3D$(CFLAGS)" \ >> + "CXXFLAGS=3D$(CXXFLAGS)" \ >> + "CFLAGS_FOR_BUILD=3D$(CFLAGS_FOR_BUILD)" \ >> + "CFLAGS_FOR_TARGET=3D$(CFLAGS_FOR_TARGET)" \ >> + "INSTALL=3D$(INSTALL)" \ >> + "INSTALL_DATA=3D$(INSTALL_DATA)" \ >> + "INSTALL_PROGRAM=3D$(INSTALL_PROGRAM)" \ >> + "INSTALL_SCRIPT=3D$(INSTALL_SCRIPT)" \ >> + "LDFLAGS=3D$(LDFLAGS)" \ >> + "LIBCFLAGS=3D$(LIBCFLAGS)" \ >> + "LIBCFLAGS_FOR_TARGET=3D$(LIBCFLAGS_FOR_TARGET)" \ >> + "MAKE=3D$(MAKE)" \ >> + "MAKEINFO=3D$(MAKEINFO) $(MAKEINFOFLAGS)" \ >> + "PICFLAG=3D$(PICFLAG)" \ >> + "PICFLAG_FOR_TARGET=3D$(PICFLAG_FOR_TARGET)" \ >> + "SHELL=3D$(SHELL)" \ >> + "RUNTESTFLAGS=3D$(RUNTESTFLAGS)" \ >> + "exec_prefix=3D$(exec_prefix)" \ >> + "infodir=3D$(infodir)" \ >> + "libdir=3D$(libdir)" \ >> + "includedir=3D$(includedir)" \ >> + "prefix=3D$(prefix)" \ >> + "tooldir=3D$(tooldir)" \ >> + "gxx_include_dir=3D$(gxx_include_dir)" \ >> + "AR=3D$(AR)" \ >> + "AS=3D$(AS)" \ >> + "LD=3D$(LD)" \ >> + "RANLIB=3D$(RANLIB)" \ >> + "NM=3D$(NM)" \ >> + "NM_FOR_BUILD=3D$(NM_FOR_BUILD)" \ >> + "NM_FOR_TARGET=3D$(NM_FOR_TARGET)" \ >> + "DESTDIR=3D$(DESTDIR)" \ >> + "WERROR=3D$(WERROR)" \ >> + "TARGET_LIB_PATH=3D$(TARGET_LIB_PATH)" \ >> + "TARGET_LIB_PATH_libgm2=3D$(TARGET_LIB_PATH_libgm2)" >> + >> +toolexeclib_LTLIBRARIES =3D libproc_macro.la >> + >> +libproc_macro_la_SOURCES =3D \ >> + proc_macro.cc >> + >> +include_HEADERS =3D \ >> + proc_macro.h >> + >> diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_mac= ro/proc_macro.cc >> new file mode 100644 >> index 00000000000..d13276294aa >> --- /dev/null >> +++ b/libgrust/libproc_macro/proc_macro.cc >> @@ -0,0 +1,7 @@ >> +#include "proc_macro.h" >> + >> +int >> +test () >> +{ >> + return 0; >> +} >> diff --git a/libgrust/libproc_macro/proc_macro.h b/libgrust/libproc_macr= o/proc_macro.h >> new file mode 100644 >> index 00000000000..2c96b3de685 >> --- /dev/null >> +++ b/libgrust/libproc_macro/proc_macro.h >> @@ -0,0 +1,7 @@ >> +#ifndef PROC_MACRO_H >> +#define PROC_MACRO_H >> + >> +int >> +test (); >> + >> +#endif /* ! PROC_MACRO_H */ >> -- >> 2.42.0 >> ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955