aboutsummaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-01-21 09:47:11 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2017-01-21 09:47:11 +0100
commit73aa401ecf498ad3d739bde4127da73e2eb01932 (patch)
tree6a14b97f2fe0573dfa5371387fc81ee79e32e653 /libffi
parentea9f867b7b5985b98e9f5c6ff9a2239f3a9e8496 (diff)
downloadgcc-73aa401ecf498ad3d739bde4127da73e2eb01932.zip
gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.gz
gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.bz2
re PR other/79046 (g++ -print-file-name=plugin uses full version number in path)
PR other/79046 libatomic/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. libffi/ * configure.ac: Add GCC_BASE_VER. * include/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * configure: Regenerated. * testsuite/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * Makefile.in: Regenerated. * man/Makefile.in: Regenerated. libgomp/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. libitm/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. libmpx/ * mpxrt/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * mpxwrap/Makefile.am (gcc_version): Likewise. * mpxrt/Makefile.in: Regenerated. * mpxwrap/Makefile.in: Regenerated. liboffloadmic/ * plugin/configure.ac: Add GCC_BASE_VER. * plugin/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * plugin/configure: Regenerated. * plugin/aclocal.m4: Regenerated. * plugin/Makefile.in: Regenerated. libsanitizer/ * interception/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * asan/Makefile.am (gcc_version): Likewise. * ubsan/Makefile.am (gcc_version): Likewise. * sanitizer_common/Makefile.am (gcc_version): Likewise. * lsan/Makefile.am (gcc_version): Likewise. * tsan/Makefile.am (gcc_version): Likewise. * interception/Makefile.in: Regenerated. * asan/Makefile.in: Regenerated. * ubsan/Makefile.in: Regenerated. * sanitizer_common/Makefile.in: Regenerated. * lsan/Makefile.in: Regenerated. * tsan/Makefile.in: Regenerated. libvtv/ * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead of cat to get version from BASE-VER file. * testsuite/Makefile.in: Regenerated. From-SVN: r244742
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog12
-rw-r--r--libffi/Makefile.in1
-rwxr-xr-xlibffi/configure23
-rw-r--r--libffi/configure.ac3
-rw-r--r--libffi/include/Makefile.am2
-rw-r--r--libffi/include/Makefile.in3
-rw-r--r--libffi/man/Makefile.in1
-rw-r--r--libffi/testsuite/Makefile.in1
8 files changed, 42 insertions, 4 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a0ed590..e73b93b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,15 @@
+2017-01-21 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/79046
+ * configure.ac: Add GCC_BASE_VER.
+ * include/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
+ of cat to get version from BASE-VER file.
+ * configure: Regenerated.
+ * testsuite/Makefile.in: Regenerated.
+ * include/Makefile.in: Regenerated.
+ * Makefile.in: Regenerated.
+ * man/Makefile.in: Regenerated.
+
2016-11-15 Matthias Klose <doko@ubuntu.com>
* configure: Regenerate.
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index f4292b5..8a99ee5 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -293,6 +293,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libffi/configure b/libffi/configure
index 4648c43..74b747b 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+get_gcc_base_ver
LIBAT_BUILD_VERSIONED_SHLIB_SUN_FALSE
LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE
LIBAT_BUILD_VERSIONED_SHLIB_GNU_FALSE
@@ -777,6 +778,7 @@ enable_structs
enable_raw_api
enable_purify_safety
enable_symvers
+with_gcc_major_version_only
'
ac_precious_vars='build_alias
host_alias
@@ -1434,6 +1436,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-gcc-major-version-only
+ use only GCC major number in filesystem paths
Some influential environment variables:
CC C compiler command
@@ -11386,7 +11390,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11389 "configure"
+#line 11393 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11492,7 +11496,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11495 "configure"
+#line 11499 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16433,6 +16437,21 @@ fi
$as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;}
+# Determine what GCC version number to use in filesystem paths.
+
+ get_gcc_base_ver="cat"
+
+# 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/'"
+ fi
+
+fi
+
+
+
+
ac_config_commands="$ac_config_commands include"
ac_config_commands="$ac_config_commands src"
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 6205a10..a01d8ac 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -358,6 +358,9 @@ fi
# Check linker support.
LIBAT_ENABLE_SYMVERS
+# Determine what GCC version number to use in filesystem paths.
+GCC_BASE_VER
+
AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
AC_CONFIG_COMMANDS(src, [
test -d src || mkdir src
diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am
index 79f222c..37fde6e 100644
--- a/libffi/include/Makefile.am
+++ b/libffi/include/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS=ffi_common.h ffi_cfi.h
EXTRA_DIST=ffi.h.in
# Where generated headers like ffitarget.h get installed.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
toollibffi_HEADERS = ffi.h ffitarget.h
diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index 82b25d7..e0c7599 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -211,6 +211,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -252,7 +253,7 @@ noinst_HEADERS = ffi_common.h ffi_cfi.h
EXTRA_DIST = ffi.h.in
# Where generated headers like ffitarget.h get installed.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
toollibffi_HEADERS = ffi.h ffitarget.h
all: all-am
diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in
index be296a5..0243bdb 100644
--- a/libffi/man/Makefile.in
+++ b/libffi/man/Makefile.in
@@ -209,6 +209,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in
index 0e24420..b7da4b0 100644
--- a/libffi/testsuite/Makefile.in
+++ b/libffi/testsuite/Makefile.in
@@ -180,6 +180,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@