From: David Malcolm <dmalcolm@redhat.com>
To: jakub@redhat.com
Cc: gcc-patches@gcc.gnu.org, jit@gcc.gnu.org,
David Malcolm <dmalcolm@redhat.com>
Subject: [PATCH] configure.ac: honor --with-gcc-major-version in gcc-driver-name.h (PR jit/85384)
Date: Mon, 01 Jan 2018 00:00:00 -0000 [thread overview]
Message-ID: <1523566281-53547-1-git-send-email-dmalcolm@redhat.com> (raw)
This patch updates gcc/configure.ac to use gcc_base_ver.
I had to drop the \$\$ from the sed expression to get it to work
within the configure script; I'm not entirely sure what their purpose
is. Without them, it's still matching on the first group of numeric
characters in BASE-VER.
Tested with and without --with-gcc-major-version; in each case,
gcc-driver-name.h is correctly determined.
Fixes the linker issue reported downstream in
https://bugzilla.redhat.com/show_bug.cgi?id=1566178
and fixes the driver not found issue with:
gcc_jit_context_set_bool_use_external_driver (ctxt, 1);
Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
OK for trunk?
config/ChangeLog:
PR jit/85384
* acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression.
gcc/ChangeLog:
PR jit/85384
* configure.ac (gcc-driver-name.h): Honor --with-gcc-major-version
by using gcc_base_ver to generate a gcc_driver_version, and use
it when generating GCC_DRIVER_NAME.
* configure.ac: Regenerate.
---
config/acx.m4 | 2 +-
gcc/configure.ac | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/config/acx.m4 b/config/acx.m4
index aa1d34b..87c1b5e 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -246,7 +246,7 @@ AC_DEFUN([GCC_BASE_VER],
[AS_HELP_STRING([--with-gcc-major-version-only], [use only GCC major number in filesystem paths])],
[if test x$with_gcc_major_version_only = xyes ; then
changequote(,)dnl
- get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'"
+ get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'"
changequote([,])dnl
fi
])
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 67e1682..b066cc6 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -6499,8 +6499,10 @@ AC_DEFINE_UNQUOTED(DIAGNOSTICS_COLOR_DEFAULT, $DIAGNOSTICS_COLOR_DEFAULT,
# Generate gcc-driver-name.h containing GCC_DRIVER_NAME for the benefit
# of jit/jit-playback.c.
+gcc_driver_version=`eval "${get_gcc_base_ver} $srcdir/BASE-VER"`
+echo "gcc_driver_version: ${gcc_driver_version}"
cat > gcc-driver-name.h <<EOF
-#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_BASEVER}${exeext}"
+#define GCC_DRIVER_NAME "${target_noncanonical}-gcc-${gcc_driver_version}${exeext}"
EOF
# Check whether --enable-default-pie was given.
--
1.8.5.3
next reply other threads:[~2018-04-12 20:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-01 0:00 David Malcolm [this message]
2018-01-01 0:00 ` [PATCH] configure.ac: honor --with-gcc-major-version in gcc-driver-name.h (PR jit/85384, variant) Jakub Jelinek
2018-01-01 0:00 ` [PATCH] configure.ac: honor --with-gcc-major-version in gcc-driver-name.h (PR jit/85384) Jakub Jelinek
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=1523566281-53547-1-git-send-email-dmalcolm@redhat.com \
--to=dmalcolm@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=jit@gcc.gnu.org \
/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).