From: "Maciej W. Rozycki" <macro@wdc.com>
To: libffi-discuss@sourceware.org
Cc: Anthony Green <green@moxielogic.com>,
Mike Stump <mikestump@comcast.net>,
gcc-patches@gcc.gnu.org
Subject: [PATCH libffi 2/4] Use a documented way to pass $compiler_vendor to DejaGNU
Date: Fri, 3 Apr 2020 23:55:53 +0100 (BST) [thread overview]
Message-ID: <alpine.LFD.2.21.2004031354120.461@redsun52.ssa.fujisawa.hgst.com> (raw)
In-Reply-To: <alpine.LFD.2.21.2004012222200.461@redsun52.ssa.fujisawa.hgst.com>
Use Autoconf substitution in the template used for extra DejaGNU site
configuration, which is a documented supported way to pass information
from the `configure' script, rather than resorting to a hack with
extracting an undocumented internal setting from `config.log' to pass
the compiler vendor to DejaGNU. No functional change (and no risk of
breakage with some Autoconf version anymore).
Use AM_SUBST_NOTMAKE with the new substitution so as not to place it in
Makefile.in files, where it is not needed, and set the Autmoake version
requirement accordingly.
---
Hi,
I chose to use AM_SUBST_NOTMAKE so as not to clutter Makefile.in files
with the new variable as Automake does that by default. That however
requires the use of Automake 1.11 or newer. By the look of our sources
that shouldn't be an issue as far as I can tell, but the macro invocation
can be dropped along with the requirement if it would.
Maciej
---
Makefile.am | 3 ++-
configure.ac | 2 ++
testsuite/lib/libffi.exp | 4 ----
testsuite/local.exp.in | 1 +
4 files changed, 5 insertions(+), 5 deletions(-)
libffi-compiler-vendor.diff
Index: libffi/Makefile.am
===================================================================
--- libffi.orig/Makefile.am
+++ libffi/Makefile.am
@@ -1,6 +1,7 @@
## Process this with automake to create Makefile.in
-AUTOMAKE_OPTIONS = foreign subdir-objects
+# Automake 1.11 needed for AM_SUBST_NOTMAKE.
+AUTOMAKE_OPTIONS = 1.11 foreign subdir-objects
ACLOCAL_AMFLAGS = -I m4
Index: libffi/configure.ac
===================================================================
--- libffi.orig/configure.ac
+++ libffi/configure.ac
@@ -45,6 +45,8 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CHECK_SIZEOF([size_t])
AX_COMPILER_VENDOR
+AC_SUBST([compiler_vendor], [$ax_cv_c_compiler_vendor])
+AM_SUBST_NOTMAKE([compiler_vendor])
AX_CC_MAXOPT
# The AX_CFLAGS_WARN_ALL macro doesn't currently work for sunpro
# compiler.
Index: libffi/testsuite/lib/libffi.exp
===================================================================
--- libffi.orig/testsuite/lib/libffi.exp
+++ libffi/testsuite/lib/libffi.exp
@@ -286,10 +286,6 @@ proc libffi-init { args } {
verbose "libffi $blddirffi"
- # Which compiler are we building with?
- set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"]
- regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor
-
if { [string match $compiler_vendor "gnu"] } {
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} {
Index: libffi/testsuite/local.exp.in
===================================================================
--- libffi.orig/testsuite/local.exp.in
+++ libffi/testsuite/local.exp.in
@@ -1,2 +1,3 @@
set CC_FOR_TARGET "@CC@"
set CXX_FOR_TARGET "@CXX@"
+set compiler_vendor "@compiler_vendor@"
next prev parent reply other threads:[~2020-04-03 22:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 22:55 [PATCH libffi 0/4] Robustify compiler and library path selection in the testsuite Maciej W. Rozycki
2020-04-03 22:55 ` [PATCH libffi 1/4] Use a template to pass $CC and $CXX to DejaGNU Maciej W. Rozycki
2020-04-06 17:58 ` Jeff Law
2020-04-03 22:55 ` Maciej W. Rozycki [this message]
2020-04-06 18:00 ` [PATCH libffi 2/4] Use a documented way to pass $compiler_vendor " Jeff Law
2020-04-03 22:56 ` [PATCH libffi 3/4] Make `libffi-init' use $CC_FOR_TARGET Maciej W. Rozycki
2020-04-06 18:03 ` Jeff Law
2020-04-03 22:56 ` [PATCH libffi 4/4] Correct indentation throughout `libffi-init' Maciej W. Rozycki
2020-04-06 18:01 ` Jeff Law
2020-04-14 13:59 ` [PING][PATCH libffi 0/4] Robustify compiler and library path selection in the testsuite Maciej W. Rozycki
2020-04-20 12:50 ` [PING^2][PATCH " Maciej W. Rozycki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.21.2004031354120.461@redsun52.ssa.fujisawa.hgst.com \
--to=macro@wdc.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=green@moxielogic.com \
--cc=libffi-discuss@sourceware.org \
--cc=mikestump@comcast.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).