diff options
Diffstat (limited to 'lto-plugin')
| -rw-r--r-- | lto-plugin/ChangeLog | 14 | ||||
| -rw-r--r-- | lto-plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | lto-plugin/Makefile.in | 4 | ||||
| -rwxr-xr-x | lto-plugin/configure | 16 | ||||
| -rw-r--r-- | lto-plugin/configure.ac | 10 |
5 files changed, 42 insertions, 4 deletions
diff --git a/lto-plugin/ChangeLog b/lto-plugin/ChangeLog index 0bb13540db0..195ab453a4a 100644 --- a/lto-plugin/ChangeLog +++ b/lto-plugin/ChangeLog @@ -1,3 +1,17 @@ +2014-11-13 Bernd Schmidt <bernds@codesourcery.com> + Thomas Schwinge <thomas@codesourcery.com> + Ilya Verbin <ilya.verbin@intel.com> + Andrey Turetskiy <andrey.turetskiy@intel.com> + + * Makefile.am (libexecsubdir): Tweak for the possibility of being + configured for offload compiler. + (accel_dir_suffix, real_target_noncanonical): New variables substituted + by configure. + * Makefile.in: Regenerate. + * configure: Regenerate. + * configure.ac (accel_dir_suffix, real_target_noncanonical): Compute new + variables. + 2014-11-11 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR target/63610 diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am index 93ea6498c55..c637ecb5743 100644 --- a/lto-plugin/Makefile.am +++ b/lto-plugin/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = no-dependencies gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) target_noncanonical := @target_noncanonical@ -libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) +libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = @ac_lto_plugin_warn_cflags@ diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in index b15d90197dc..4bd943bdb01 100644 --- a/lto-plugin/Makefile.in +++ b/lto-plugin/Makefile.in @@ -167,6 +167,7 @@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_lto_plugin_ldflags = @ac_lto_plugin_ldflags@ ac_lto_plugin_warn_cflags = @ac_lto_plugin_warn_cflags@ +accel_dir_suffix = @accel_dir_suffix@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -209,6 +210,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +real_target_noncanonical = @real_target_noncanonical@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -227,7 +229,7 @@ with_libiberty = @with_libiberty@ ACLOCAL_AMFLAGS = -I .. -I ../config AUTOMAKE_OPTIONS = no-dependencies gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) +libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix) AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) AM_CFLAGS = @ac_lto_plugin_warn_cflags@ AM_LDFLAGS = @ac_lto_plugin_ldflags@ diff --git a/lto-plugin/configure b/lto-plugin/configure index 5f3dd222020..9d1b09440d7 100755 --- a/lto-plugin/configure +++ b/lto-plugin/configure @@ -622,6 +622,8 @@ EGREP GREP SED LIBTOOL +real_target_noncanonical +accel_dir_suffix gcc_build_dir ac_lto_plugin_ldflags ac_lto_plugin_warn_cflags @@ -4135,6 +4137,16 @@ else fi +# Used for constructing correct paths for offload compilers. +accel_dir_suffix= +real_target_noncanonical=${target_noncanonical} +if test x"$enable_as_accelerator_for" != x; then + accel_dir_suffix=/accel/${target_noncanonical} + real_target_noncanonical=${enable_as_accelerator_for} +fi + + + case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -10607,7 +10619,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10610 "configure" +#line 10622 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10713,7 +10725,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10716 "configure" +#line 10728 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/lto-plugin/configure.ac b/lto-plugin/configure.ac index c3ae93e12a7..db5b6cd64c8 100644 --- a/lto-plugin/configure.ac +++ b/lto-plugin/configure.ac @@ -34,6 +34,16 @@ else fi AC_SUBST(gcc_build_dir) +# Used for constructing correct paths for offload compilers. +accel_dir_suffix= +real_target_noncanonical=${target_noncanonical} +if test x"$enable_as_accelerator_for" != x; then + accel_dir_suffix=/accel/${target_noncanonical} + real_target_noncanonical=${enable_as_accelerator_for} +fi +AC_SUBST(accel_dir_suffix) +AC_SUBST(real_target_noncanonical) + AM_PROG_LIBTOOL ACX_LT_HOST_FLAGS AC_SUBST(target_noncanonical) |