summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2018-04-18 09:46:58 +0000
committerJakub Jelinek <jakub@gcc.gnu.org>2018-04-18 11:46:58 +0200
commit001ddaa852f8e18468e5a9356ba5d2eebb1f7f66 (patch)
treeaef33a6ef006568578b391fab19aefd57ef86ecc /libffi
parentb08aea04c2f28650b74878096fb0fba8156f0e26 (diff)
re PR jit/85384 (libgccjit does not work if --with-gcc-major-version is used)
PR jit/85384 * acx.m4 (GCC_BASE_VER): Remove \$\$ from sed expression. * 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: Regenerate. * configure: Regenerate. From-SVN: r259462
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog5
-rwxr-xr-xlibffi/configure2
2 files changed, 6 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index f7de95059b1..eaface5ef2f 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-18 David Malcolm <dmalcolm@redhat.com>
+
+ PR jit/85384
+ * configure: Regenerate.
+
2017-08-31 Tony Reix <tony.reix@atos.net>
* src/powerpc/aix.S (ffi_call_AIX): Add debugging pseudo-op and
diff --git a/libffi/configure b/libffi/configure
index 74b747b3b7e..790a291011f 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -16444,7 +16444,7 @@ $as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;}
# Check whether --with-gcc-major-version-only was given.
if test "${with_gcc_major_version_only+set}" = set; then :
withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then
- get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'"
+ get_gcc_base_ver="sed -e 's/^\([0-9]*\).*/\1/'"
fi
fi