Fix libgcc installation for offload targets.

	* Makefile.in (real_host_noncanonical): New variable.
	(libsubdir): Use it.
	* configure.ac (real_host_noncanonical): Compute.  Remove special
	case for intelmicemul.
	* configure: Regenerate.

From-SVN: r222585

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index b18c7aed9b8bb2688e5f3b2e788ad9b5adb8e309..39c9433d6443cdd04594cf8abb9aa6157e55a37f 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-29  Bernd Schmidt  <bernds@codesourcery.com>
+
+       * Makefile.in (real_host_noncanonical): New variable.
+       (libsubdir): Use it.
+       * configure.ac (real_host_noncanonical): Compute.  Remove special
+       case for intelmicemul.
+       * configure: Regenerate.
+
 2015-04-28  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/frv/elf-lib.h: New file.

diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 88ddfea18eb229cfbf7bc098bada4ce31dfcf159..1ab188d632104b73cd8f44413cd7589cbef68886 100644 (file)
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -45,6 +45,7 @@ fixed_point = @fixed_point@
 with_aix_soname = @with_aix_soname@
 
 host_noncanonical = @host_noncanonical@
+real_host_noncanonical = @real_host_noncanonical@
 target_noncanonical = @target_noncanonical@
 
 # List of extra object files that should be compiled for this target machine.
@@ -185,7 +186,7 @@ STRIP = @STRIP@
 STRIP_FOR_TARGET = $(STRIP)
 
 # Directory in which the compiler finds libraries etc.
-libsubdir = $(libdir)/gcc/$(host_noncanonical)/$(version)@accel_dir_suffix@
+libsubdir = $(libdir)/gcc/$(real_host_noncanonical)/$(version)@accel_dir_suffix@
 # Used to install the shared libgcc.
 slibdir = @slibdir@
 # Maybe used for DLLs on Windows targets.

diff --git a/libgcc/configure b/libgcc/configure
index 08c931929c7c7ba4c3d80ff3d2c3ff04b9701da7..e911a9dcb466fdd77483894e513acda29f570d24 100644 (file)
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -566,6 +566,7 @@ sfp_machine_header
 set_use_emutls
 set_have_cc_tls
 vis_hide
+real_host_noncanonical
 accel_dir_suffix
 force_explicit_eh_registry
 fixed_point
@@ -4778,17 +4779,14 @@ esac
 
 # Used for constructing correct paths for offload compilers.
 accel_dir_suffix=
+real_host_noncanonical=${host_noncanonical}
 if test x"$enable_as_accelerator_for" != x; then
   accel_dir_suffix=/accel/${target_noncanonical}
-  case "${target_noncanonical}" in
-    *-intelmicemul-*)
-      # In this case we expect offload compiler to be built as native, so we
-      # need to change install directory for driver to be able to find libgcc.
-      host_noncanonical=${enable_as_accelerator_for} ;;
-  esac
+  real_host_noncanonical=${enable_as_accelerator_for}
 fi
 
 
+
 if test x"$enable_offload_targets" != x; then
   extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o"
 fi

diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index 1c405e8dfe5a298967dc74fafd8dae43e83a6f11..48fd5b9abc1beac8ec9e8719f74715deca1c9aed 100644 (file)
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -403,16 +403,13 @@ esac
 
 # Used for constructing correct paths for offload compilers.
 accel_dir_suffix=
+real_host_noncanonical=${host_noncanonical}
 if test x"$enable_as_accelerator_for" != x; then
   accel_dir_suffix=/accel/${target_noncanonical}
-  case "${target_noncanonical}" in
-    *-intelmicemul-*)
-      # In this case we expect offload compiler to be built as native, so we
-      # need to change install directory for driver to be able to find libgcc.
-      host_noncanonical=${enable_as_accelerator_for} ;;
-  esac
+  real_host_noncanonical=${enable_as_accelerator_for}
 fi
 AC_SUBST(accel_dir_suffix)
+AC_SUBST(real_host_noncanonical)
 
 if test x"$enable_offload_targets" != x; then
   extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o"