From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 3C3C6385609B for ; Wed, 25 Oct 2023 11:06:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C3C6385609B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3C3C6385609B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698232005; cv=none; b=imTzP2NAI5X0/Rr7UhnTUYFoSKENYMJ+zGD96QKNfVHIW36Ga1jZBZMJ8T8woF4hXU8tyImzVQl5CJVtBHNt7SMpsvs9LnT9sxwcYf/fSyRsaaHTYqYcKObhwqZ5OvWE81K1xAWxEJxGuhu0bjF1m1nAfYS/x74AqJgxtZA++vo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698232005; c=relaxed/simple; bh=sBDP2B8XWpXR1hBorKcuWIigKKYnbT/smLBRC6YVm2A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=bcEDVBi1XSRdR0p03+gZ9MdjTVIm9GmwzdRF/JQhiZJpKpCTzp777OPOIS1U/KoMSalBzaqhfVc58ERNmVcIHDiy0CnFOqf8l5QwH8CJH4vFpglYPOPXZBY0zg0QxeWna/6Cr/SKqE3IH7Tpot6tw5sp3NHIcawB0vl4pFy8vR8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40891d38e3fso28818855e9.1 for ; Wed, 25 Oct 2023 04:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1698232002; x=1698836802; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vaY3nfvfmbzYDJbqOWLH5VazHNV+dHpgd5Bxd72/usE=; b=DMb0Gp3rFsnoGB410vd2UtGhaXY01rPhGtwGBt0qJpFwNXVQAUc9spyN/MaN3zLXyZ mdCNY0QLMSi3iGmgh4rrhdMg3wgeSpDTrpuH8oYNpuW/a205P/tgEZMz1EfvOO2SBUl8 mmj72Kb/aYp1fc6zsvBJRT8ntt0FZrS/9aXkiXtcqZW6ad3t57UUGKwrejcA/WhF1pBN vJXsE4vwtULIHsfQ/ZmszgTQKmDpw5ZzsRvuL16zUJP5risWhUbwT3AYVn7s661d0L46 5pldjoTKw3v9yRyHuAaq7xcyfbT6fMuqVszfPsXwlTrs2zgzLmy8zN/j080qqJa+TEX7 yiYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698232002; x=1698836802; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vaY3nfvfmbzYDJbqOWLH5VazHNV+dHpgd5Bxd72/usE=; b=B+d+LRhRs05xg1ue3twScRqZ0V/a+0tScGRXN7SKu8W00mC2u7uAuZPTFZhaZFWEJk 1Lc8uUVdrMnBGwbDnShe1BvoNIx3tMHqqKXi1OiNXhzAj5iuCTAPBhdA4DvYUH/9wORF iAQmhYvPOgPXmjyUsAcosxIJAM8zGT2ItsncugJnnjz9P82TA2iJhR8WLP2qoDHHs+Sh 7JNYRzJnwg8cjp3eqT6ZjcohAoVyr8vYy2un1Ms2FnGTR8Qo0eUlLObRAk/32HrGGRcs yM9OXd8jocMYpeT4n+QH4Vq3br6V8/dveEIPLQBfle5fnHtjFzHbD9MOHwaKa+GbFgIe f+3w== X-Gm-Message-State: AOJu0YzIOTRXbbxze8yzIJdrRw79QvFrC1fuh/i2aadg867lsx5EvLcE A4XyWrPW4FsAlCf/JkNFXRWRemjD421mQbzTvAY7 X-Google-Smtp-Source: AGHT+IFTavWsraUdz8XxmD2hqbPK2EY14TcvLT3wtILhCZhhcuZIfuvlP1253fDgpZxlvNUkT7XjJA== X-Received: by 2002:a05:600c:468c:b0:408:3ea0:3026 with SMTP id p12-20020a05600c468c00b004083ea03026mr11185364wmo.11.1698232001915; Wed, 25 Oct 2023 04:06:41 -0700 (PDT) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id bi9-20020a05600c3d8900b003fc16ee2864sm14263608wmb.48.2023.10.25.04.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 04:06:41 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [PATCH v2 2/4] libgrust: Add libproc_macro and build system Date: Wed, 25 Oct 2023 13:06:46 +0200 Message-ID: <20231025110658.1232737-3-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231025110658.1232737-1-arthur.cohen@embecosm.com> References: <20231025110658.1232737-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: From: Pierre-Emmanuel Patry Add some dummy files in libproc_macro along with its build system. libgrust/Changelog: * Makefile.am: New file. * configure.ac: New file. * libproc_macro/Makefile.am: New file. * libproc_macro/proc_macro.cc: New file. * libproc_macro/proc_macro.h: New file. Signed-off-by: Pierre-Emmanuel Patry --- 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 = 1.8 foreign + +SUFFIXES = .c .rs .def .o .lo .a + +ACLOCAL_AMFLAGS = -I . -I .. -I ../config + +AM_CFLAGS = -I $(srcdir)/../libgcc -I $(MULTIBUILDTOP)../../gcc/include + +TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd) + +GCC_DIR = $(TOP_GCCDIR)/gcc +RUST_SRC = $(GCC_DIR)/rust + +toolexeclibdir=@toolexeclibdir@ +toolexecdir=@toolexecdir@ + +SUBDIRS = libproc_macro + +RUST_BUILDDIR := $(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 = \ + "GCC_DIR=$(GCC_DIR)" \ + "RUST_SRC=$(RUST_SRC)" \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ + "RUST_FOR_TARGET=$(RUST_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "includedir=$(includedir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "gxx_include_dir=$(gxx_include_dir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "LD=$(LD)" \ + "RANLIB=$(RANLIB)" \ + "NM=$(NM)" \ + "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ + "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ + "WERROR=$(WERROR)" \ + "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" \ + "TARGET_LIB_PATH_librust=$(TARGET_LIB_PATH_librust)" \ + "LIBTOOL=$(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=${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 libraries should be installed in a compiler-specific directory ], +[case "$enableval" in + yes) version_specific_libs=yes ;; + no) version_specific_libs=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);; + esac], +[version_specific_libs=no]) +AC_MSG_RESULT($version_specific_libs) + +toolexecdir=no +toolexeclibdir=no + +# 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='$(libdir)/gcc/$(target_noncanonical)' + toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' + ;; + no) + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_noncanonical)' + toolexeclibdir='$(toolexecdir)/lib' + else + toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)' + toolexeclibdir='$(libdir)' + fi + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$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 =' >> $ac_file + ml_norecursion=yes + 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 = .cc .o .a .lo .la + +ACLOCAL_AMFLAGS = -I .. -I ../../config + +toolexeclibdir=@toolexeclibdir@ +toolexecdir=@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 = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "includedir=$(includedir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "gxx_include_dir=$(gxx_include_dir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "LD=$(LD)" \ + "RANLIB=$(RANLIB)" \ + "NM=$(NM)" \ + "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ + "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ + "WERROR=$(WERROR)" \ + "TARGET_LIB_PATH=$(TARGET_LIB_PATH)" \ + "TARGET_LIB_PATH_libgm2=$(TARGET_LIB_PATH_libgm2)" + +toolexeclib_LTLIBRARIES = libproc_macro.la + +libproc_macro_la_SOURCES = \ + proc_macro.cc + +include_HEADERS = \ + proc_macro.h + diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_macro/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_macro/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