diff options
44 files changed, 164 insertions, 38 deletions
diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 9e0c02f5c0e..f87859d3c51 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,10 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead + of cat to get version from BASE-VER file. + * testsuite/Makefile.in: Regenerated. + 2017-01-17 Jakub Jelinek <jakub@redhat.com> PR other/79046 diff --git a/libatomic/testsuite/Makefile.am b/libatomic/testsuite/Makefile.am index 561b7e25448..a9a0144185a 100644 --- a/libatomic/testsuite/Makefile.am +++ b/libatomic/testsuite/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libatomic/testsuite/Makefile.in b/libatomic/testsuite/Makefile.in index f0928b2f3dc..adfc231484a 100644 --- a/libatomic/testsuite/Makefile.in +++ b/libatomic/testsuite/Makefile.in @@ -215,7 +215,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index a0ed590c8a5..e73b93b5470 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 f4292b5dd80..8a99ee58b68 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 4648c43e903..74b747b3b7e 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 6205a10c36b..a01d8ac16b0 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 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 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 82b25d7267e..e0c75992327 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 be296a57db9..0243bdbedfa 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 0e244202326..b7da4b0b3e7 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@ diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index d1c1ae1bb91..806c4f2f2bd 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead + of cat to get version from BASE-VER file. + * testsuite/Makefile.in: Regenerated. + 2017-01-19 Jakub Jelinek <jakub@redhat.com> * plugin/cuda/cuda.h (CUdeviceptr): Typedef to unsigned long long even diff --git a/libgomp/testsuite/Makefile.am b/libgomp/testsuite/Makefile.am index 66a9d947e04..e2a3f460eb0 100644 --- a/libgomp/testsuite/Makefile.am +++ b/libgomp/testsuite/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in index 9a1305016c9..6edb7ae7ade 100644 --- a/libgomp/testsuite/Makefile.in +++ b/libgomp/testsuite/Makefile.in @@ -246,7 +246,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 5f44e3f1250..f930cf38797 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,10 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead + of cat to get version from BASE-VER file. + * testsuite/Makefile.in: Regenerated. + 2017-01-19 Uros Bizjak <ubizjak@gmail.com> * config/x86/target.h (htm_available): Determine vendor from diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am index 561b7e25448..a9a0144185a 100644 --- a/libitm/testsuite/Makefile.am +++ b/libitm/testsuite/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in index 04c4d8abe10..eb9e992279d 100644 --- a/libitm/testsuite/Makefile.in +++ b/libitm/testsuite/Makefile.in @@ -226,7 +226,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index 16c40e005e1..82daa1fc946 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,12 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * 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. + 2017-01-19 Jakub Jelinek <jakub@redhat.com> PR other/79046 diff --git a/libmpx/mpxrt/Makefile.am b/libmpx/mpxrt/Makefile.am index 3280b62a96a..41c806f9722 100644 --- a/libmpx/mpxrt/Makefile.am +++ b/libmpx/mpxrt/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config if LIBMPX_SUPPORTED # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CPPFLAGS = -I$(top_srcdir)/.. AM_CFLAGS = $(XCFLAGS) diff --git a/libmpx/mpxrt/Makefile.in b/libmpx/mpxrt/Makefile.in index 1770350e923..4c55d20c13e 100644 --- a/libmpx/mpxrt/Makefile.in +++ b/libmpx/mpxrt/Makefile.in @@ -251,7 +251,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config # May be used by toolexeclibdir. -@LIBMPX_SUPPORTED_TRUE@gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +@LIBMPX_SUPPORTED_TRUE@gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) @LIBMPX_SUPPORTED_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/.. @LIBMPX_SUPPORTED_TRUE@AM_CFLAGS = $(XCFLAGS) @LIBMPX_SUPPORTED_TRUE@toolexeclib_LTLIBRARIES = libmpx.la diff --git a/libmpx/mpxwrap/Makefile.am b/libmpx/mpxwrap/Makefile.am index f24cdc835dc..d9e84ae6621 100644 --- a/libmpx/mpxwrap/Makefile.am +++ b/libmpx/mpxwrap/Makefile.am @@ -2,7 +2,7 @@ ALCLOCAL_AMFLAGS = -I .. -I ../config AM_CPPFLAGS = -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) libmpxwrappers_la_CFLAGS = -fcheck-pointer-bounds -mmpx -fno-chkp-check-read \ -fno-chkp-check-write -fno-chkp-use-wrappers -fPIC diff --git a/libmpx/mpxwrap/Makefile.in b/libmpx/mpxwrap/Makefile.in index 19209b3a49b..1b929b9f598 100644 --- a/libmpx/mpxwrap/Makefile.in +++ b/libmpx/mpxwrap/Makefile.in @@ -251,7 +251,7 @@ ALCLOCAL_AMFLAGS = -I .. -I ../config AM_CPPFLAGS = -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) libmpxwrappers_la_CFLAGS = -fcheck-pointer-bounds -mmpx -fno-chkp-check-read \ -fno-chkp-check-write -fno-chkp-use-wrappers -fPIC diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 71c9a1cc674..3d8ad67d2d4 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,13 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * 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. + 2017-01-20 Jakub Jelinek <jakub@redhat.com> PR other/79046 diff --git a/liboffloadmic/plugin/Makefile.am b/liboffloadmic/plugin/Makefile.am index d80c970add0..7a42238581a 100644 --- a/liboffloadmic/plugin/Makefile.am +++ b/liboffloadmic/plugin/Makefile.am @@ -1,6 +1,6 @@ # Plugin for offload execution on Intel MIC devices. # -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2017 Free Software Foundation, Inc. # # Contributed by Ilya Verbin <ilya.verbin@intel.com> and # Andrey Turetskiy <andrey.turetskiy@intel.com>. @@ -42,7 +42,7 @@ liboffload_src_dir = $(top_srcdir)/../runtime liboffload_dir = $(top_builddir)/.. # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../../gcc/BASE-VER) libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include # Search for main_target_image.h in these directories target_prefix_dir = $(libdir)/gcc/$(accel_target)/$(gcc_version)$(MULTISUBDIR) diff --git a/liboffloadmic/plugin/Makefile.in b/liboffloadmic/plugin/Makefile.in index e052a4e4b7f..2a7c8d2ec6c 100644 --- a/liboffloadmic/plugin/Makefile.in +++ b/liboffloadmic/plugin/Makefile.in @@ -17,7 +17,7 @@ # Plugin for offload execution on Intel MIC devices. # -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2014-2017 Free Software Foundation, Inc. # # Contributed by Ilya Verbin <ilya.verbin@intel.com> and # Andrey Turetskiy <andrey.turetskiy@intel.com>. @@ -88,7 +88,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/../../mkinstalldirs $(srcdir)/../../depcomp \ $(am__plugin_include_HEADERS_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../config/acx.m4 \ + $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/override.m4 \ @@ -263,6 +264,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@ @@ -312,7 +314,7 @@ liboffload_src_dir = $(top_srcdir)/../runtime liboffload_dir = $(top_builddir)/.. # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../../gcc/BASE-VER) libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/include # Search for main_target_image.h in these directories target_prefix_dir = $(libdir)/gcc/$(accel_target)/$(gcc_version)$(MULTISUBDIR) diff --git a/liboffloadmic/plugin/aclocal.m4 b/liboffloadmic/plugin/aclocal.m4 index efeb122691a..a4179ef40ac 100644 --- a/liboffloadmic/plugin/aclocal.m4 +++ b/liboffloadmic/plugin/aclocal.m4 @@ -988,6 +988,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/lead-dot.m4]) m4_include([../../config/multi.m4]) diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure index 13736707dc5..8b8c041d2bf 100644 --- a/liboffloadmic/plugin/configure +++ b/liboffloadmic/plugin/configure @@ -601,6 +601,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +get_gcc_base_ver toolexeclibdir toolexecdir CXXCPP @@ -740,6 +741,7 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1395,6 +1397,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 @@ -8783,7 +8787,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -10811,7 +10815,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10814 "configure" +#line 10818 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10917,7 +10921,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10920 "configure" +#line 10924 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13269,7 +13273,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -14176,6 +14180,21 @@ hardcode_into_libs=no +# 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 + + + + # Must be last cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14915,7 +14934,6 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CC="$CC" CXX="$CXX" GFORTRAN="$GFORTRAN" -GCJ="$GCJ" # The HP-UX ksh and POSIX shell print the target directory to stdout diff --git a/liboffloadmic/plugin/configure.ac b/liboffloadmic/plugin/configure.ac index a2dd02de1e4..9c48cafd38b 100644 --- a/liboffloadmic/plugin/configure.ac +++ b/liboffloadmic/plugin/configure.ac @@ -132,5 +132,8 @@ hardcode_into_libs=no AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + # Must be last AC_OUTPUT diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 1e0d0f09d31..bdc4fb106a2 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,20 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * 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. + 2017-01-17 Jakub Jelinek <jakub@redhat.com> PR other/79046 diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am index bfd28c0388e..43377a95622 100644 --- a/libsanitizer/asan/Makefile.am +++ b/libsanitizer/asan/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 -DASAN_NEEDS_SEGV=1 -DCAN_SANITIZE_UB=0 if USING_MAC_INTERPOSE diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in index 9fe24166dd3..4dad60ba1ae 100644 --- a/libsanitizer/asan/Makefile.in +++ b/libsanitizer/asan/Makefile.in @@ -298,7 +298,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \ -fomit-frame-pointer -funwind-tables -fvisibility=hidden \ diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am index 4fb69a963d3..bd3172309bd 100644 --- a/libsanitizer/interception/Makefile.am +++ b/libsanitizer/interception/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in index cf06a831152..c71fb57b8b8 100644 --- a/libsanitizer/interception/Makefile.in +++ b/libsanitizer/interception/Makefile.in @@ -247,7 +247,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \ -fomit-frame-pointer -funwind-tables -fvisibility=hidden \ diff --git a/libsanitizer/lsan/Makefile.am b/libsanitizer/lsan/Makefile.am index 03ec4fe91fe..294342b1926 100644 --- a/libsanitizer/lsan/Makefile.am +++ b/libsanitizer/lsan/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros diff --git a/libsanitizer/lsan/Makefile.in b/libsanitizer/lsan/Makefile.in index fdc1a059fb3..d951741c300 100644 --- a/libsanitizer/lsan/Makefile.in +++ b/libsanitizer/lsan/Makefile.in @@ -288,7 +288,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \ -fomit-frame-pointer -funwind-tables -fvisibility=hidden \ diff --git a/libsanitizer/sanitizer_common/Makefile.am b/libsanitizer/sanitizer_common/Makefile.am index 8b6336fd3ad..92c8419f33d 100644 --- a/libsanitizer/sanitizer_common/Makefile.am +++ b/libsanitizer/sanitizer_common/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS @RPC_DEFS@ AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in index b015a624237..c375f63a380 100644 --- a/libsanitizer/sanitizer_common/Makefile.in +++ b/libsanitizer/sanitizer_common/Makefile.in @@ -291,7 +291,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \ -fomit-frame-pointer -funwind-tables -fvisibility=hidden \ diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am index 7a0c2971143..53a8d1cb0cd 100644 --- a/libsanitizer/tsan/Makefile.am +++ b/libsanitizer/tsan/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DCAN_SANITIZE_UB=0 AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in index 7a58323ff2f..770c053e64f 100644 --- a/libsanitizer/tsan/Makefile.in +++ b/libsanitizer/tsan/Makefile.in @@ -307,7 +307,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \ -fomit-frame-pointer -funwind-tables -fvisibility=hidden \ diff --git a/libsanitizer/ubsan/Makefile.am b/libsanitizer/ubsan/Makefile.am index 9e70b12d3fd..cb27091137a 100644 --- a/libsanitizer/ubsan/Makefile.am +++ b/libsanitizer/ubsan/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DPIC -DCAN_SANITIZE_UB=1 AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in index 23939f0bf68..1664ce9497e 100644 --- a/libsanitizer/ubsan/Makefile.in +++ b/libsanitizer/ubsan/Makefile.in @@ -286,7 +286,7 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include # May be used by toolexeclibdir. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fno-rtti \ -fomit-frame-pointer -funwind-tables -fvisibility=hidden \ diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index 45b24c8431c..be5d9930ecc 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,10 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * testsuite/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead + of cat to get version from BASE-VER file. + * testsuite/Makefile.in: Regenerated. + 2017-01-17 Jakub Jelinek <jakub@redhat.com> PR other/79046 diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am index 561b7e25448..a9a0144185a 100644 --- a/libvtv/testsuite/Makefile.am +++ b/libvtv/testsuite/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in index 7688f3c88c8..b5dfd29973c 100644 --- a/libvtv/testsuite/Makefile.in +++ b/libvtv/testsuite/Makefile.in @@ -220,7 +220,7 @@ toplevel_srcdir = @toplevel_srcdir@ AUTOMAKE_OPTIONS = foreign dejagnu # May be used by various substitution variables. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \ echo $(top_builddir)/../expect/expect; else echo expect; fi) |