summaryrefslogtreecommitdiffstats
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
parentre PR rtl-optimization/79125 (ICE in rtl_verify_bb_insns, at cfgrtl.c:2661 (e... (diff)
downloadgcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.gz
gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.bz2
gcc-73aa401ecf498ad3d739bde4127da73e2eb01932.tar.xz
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 a0ed590c8a5..e73b93b5470 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,15 @@
12017-01-21 Jakub Jelinek <jakub@redhat.com>
2
3 PR other/79046
4 * configure.ac: Add GCC_BASE_VER.
5 * include/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead
6 of cat to get version from BASE-VER file.
7 * configure: Regenerated.
8 * testsuite/Makefile.in: Regenerated.
9 * include/Makefile.in: Regenerated.
10 * Makefile.in: Regenerated.
11 * man/Makefile.in: Regenerated.
12
12016-11-15 Matthias Klose <doko@ubuntu.com> 132016-11-15 Matthias Klose <doko@ubuntu.com>
2 14
3 * configure: Regenerate. 15 * configure: Regenerate.
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index f4292b5dd80..8a99ee58b68 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -293,6 +293,7 @@ datarootdir = @datarootdir@
293docdir = @docdir@ 293docdir = @docdir@
294dvidir = @dvidir@ 294dvidir = @dvidir@
295exec_prefix = @exec_prefix@ 295exec_prefix = @exec_prefix@
296get_gcc_base_ver = @get_gcc_base_ver@
296host = @host@ 297host = @host@
297host_alias = @host_alias@ 298host_alias = @host_alias@
298host_cpu = @host_cpu@ 299host_cpu = @host_cpu@
diff --git a/libffi/configure b/libffi/configure
index 4648c43e903..74b747b3b7e 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE
604am__EXEEXT_TRUE 604am__EXEEXT_TRUE
605LTLIBOBJS 605LTLIBOBJS
606LIBOBJS 606LIBOBJS
607get_gcc_base_ver
607LIBAT_BUILD_VERSIONED_SHLIB_SUN_FALSE 608LIBAT_BUILD_VERSIONED_SHLIB_SUN_FALSE
608LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE 609LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE
609LIBAT_BUILD_VERSIONED_SHLIB_GNU_FALSE 610LIBAT_BUILD_VERSIONED_SHLIB_GNU_FALSE
@@ -777,6 +778,7 @@ enable_structs
777enable_raw_api 778enable_raw_api
778enable_purify_safety 779enable_purify_safety
779enable_symvers 780enable_symvers
781with_gcc_major_version_only
780' 782'
781 ac_precious_vars='build_alias 783 ac_precious_vars='build_alias
782host_alias 784host_alias
@@ -1434,6 +1436,8 @@ Optional Packages:
1434 --with-pic try to use only PIC/non-PIC objects [default=use 1436 --with-pic try to use only PIC/non-PIC objects [default=use
1435 both] 1437 both]
1436 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1438 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1439 --with-gcc-major-version-only
1440 use only GCC major number in filesystem paths
1437 1441
1438Some influential environment variables: 1442Some influential environment variables:
1439 CC C compiler command 1443 CC C compiler command
@@ -11386,7 +11390,7 @@ else
11386 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11390 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11387 lt_status=$lt_dlunknown 11391 lt_status=$lt_dlunknown
11388 cat > conftest.$ac_ext <<_LT_EOF 11392 cat > conftest.$ac_ext <<_LT_EOF
11389#line 11389 "configure" 11393#line 11393 "configure"
11390#include "confdefs.h" 11394#include "confdefs.h"
11391 11395
11392#if HAVE_DLFCN_H 11396#if HAVE_DLFCN_H
@@ -11492,7 +11496,7 @@ else
11492 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 11496 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11493 lt_status=$lt_dlunknown 11497 lt_status=$lt_dlunknown
11494 cat > conftest.$ac_ext <<_LT_EOF 11498 cat > conftest.$ac_ext <<_LT_EOF
11495#line 11495 "configure" 11499#line 11499 "configure"
11496#include "confdefs.h" 11500#include "confdefs.h"
11497 11501
11498#if HAVE_DLFCN_H 11502#if HAVE_DLFCN_H
@@ -16433,6 +16437,21 @@ fi
16433$as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;} 16437$as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;}
16434 16438
16435 16439
16440# Determine what GCC version number to use in filesystem paths.
16441
16442 get_gcc_base_ver="cat"
16443
16444# Check whether --with-gcc-major-version-only was given.
16445if test "${with_gcc_major_version_only+set}" = set; then :
16446 withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then
16447 get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'"
16448 fi
16449
16450fi
16451
16452
16453
16454
16436ac_config_commands="$ac_config_commands include" 16455ac_config_commands="$ac_config_commands include"
16437 16456
16438ac_config_commands="$ac_config_commands src" 16457ac_config_commands="$ac_config_commands src"
diff --git a/libffi/configure.ac b/libffi/configure.ac
index 6205a10c36b..a01d8ac16b0 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -358,6 +358,9 @@ fi
358# Check linker support. 358# Check linker support.
359LIBAT_ENABLE_SYMVERS 359LIBAT_ENABLE_SYMVERS
360 360
361# Determine what GCC version number to use in filesystem paths.
362GCC_BASE_VER
363
361AC_CONFIG_COMMANDS(include, [test -d include || mkdir include]) 364AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
362AC_CONFIG_COMMANDS(src, [ 365AC_CONFIG_COMMANDS(src, [
363test -d src || mkdir src 366test -d src || mkdir src
diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am
index 79f222c482c..37fde6e9680 100644
--- a/libffi/include/Makefile.am
+++ b/libffi/include/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS=ffi_common.h ffi_cfi.h
7EXTRA_DIST=ffi.h.in 7EXTRA_DIST=ffi.h.in
8 8
9# Where generated headers like ffitarget.h get installed. 9# Where generated headers like ffitarget.h get installed.
10gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) 10gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
11toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include 11toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
12 12
13toollibffi_HEADERS = ffi.h ffitarget.h 13toollibffi_HEADERS = ffi.h ffitarget.h
diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in
index 82b25d7267e..e0c75992327 100644
--- a/libffi/include/Makefile.in
+++ b/libffi/include/Makefile.in
@@ -211,6 +211,7 @@ datarootdir = @datarootdir@
211docdir = @docdir@ 211docdir = @docdir@
212dvidir = @dvidir@ 212dvidir = @dvidir@
213exec_prefix = @exec_prefix@ 213exec_prefix = @exec_prefix@
214get_gcc_base_ver = @get_gcc_base_ver@
214host = @host@ 215host = @host@
215host_alias = @host_alias@ 216host_alias = @host_alias@
216host_cpu = @host_cpu@ 217host_cpu = @host_cpu@
@@ -252,7 +253,7 @@ noinst_HEADERS = ffi_common.h ffi_cfi.h
252EXTRA_DIST = ffi.h.in 253EXTRA_DIST = ffi.h.in
253 254
254# Where generated headers like ffitarget.h get installed. 255# Where generated headers like ffitarget.h get installed.
255gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) 256gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
256toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include 257toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
257toollibffi_HEADERS = ffi.h ffitarget.h 258toollibffi_HEADERS = ffi.h ffitarget.h
258all: all-am 259all: all-am
diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in
index be296a57db9..0243bdbedfa 100644
--- a/libffi/man/Makefile.in
+++ b/libffi/man/Makefile.in
@@ -209,6 +209,7 @@ datarootdir = @datarootdir@
209docdir = @docdir@ 209docdir = @docdir@
210dvidir = @dvidir@ 210dvidir = @dvidir@
211exec_prefix = @exec_prefix@ 211exec_prefix = @exec_prefix@
212get_gcc_base_ver = @get_gcc_base_ver@
212host = @host@ 213host = @host@
213host_alias = @host_alias@ 214host_alias = @host_alias@
214host_cpu = @host_cpu@ 215host_cpu = @host_cpu@
diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in
index 0e244202326..b7da4b0b3e7 100644
--- a/libffi/testsuite/Makefile.in
+++ b/libffi/testsuite/Makefile.in
@@ -180,6 +180,7 @@ datarootdir = @datarootdir@
180docdir = @docdir@ 180docdir = @docdir@
181dvidir = @dvidir@ 181dvidir = @dvidir@
182exec_prefix = @exec_prefix@ 182exec_prefix = @exec_prefix@
183get_gcc_base_ver = @get_gcc_base_ver@
183host = @host@ 184host = @host@
184host_alias = @host_alias@ 185host_alias = @host_alias@
185host_cpu = @host_cpu@ 186host_cpu = @host_cpu@