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
This commit is contained in:
Jakub Jelinek
Jakub Jelinek
parent
ea9f867b7b
commit
73aa401ecf
44 changed files with 164 additions and 38 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
23
libffi/configure
vendored
23
libffi/configure
vendored
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
1
liboffloadmic/plugin/aclocal.m4
vendored
1
liboffloadmic/plugin/aclocal.m4
vendored
|
|
@ -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])
|
||||
|
|
|
|||
28
liboffloadmic/plugin/configure
vendored
28
liboffloadmic/plugin/configure
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue