From d28ad5d4c5454c0a2ca24d6dcbbc9b2da5c0aaf2 Mon Sep 17 00:00:00 2001
From: Bernd Schmidt <bernds@codesourcery.com>
Date: Wed, 29 Apr 2015 16:52:45 +0000
Subject: [PATCH] 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
---
libgcc/ChangeLog | 8 ++++++++
libgcc/Makefile.in | 3 ++-
libgcc/configure | 10 ++++------
libgcc/configure.ac | 9 +++------
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index b18c7aed9b8b..39c9433d6443 100644
--- 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 88ddfea18eb2..1ab188d63210 100644
--- 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 08c931929c7c..e911a9dcb466 100644
--- 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 1c405e8dfe5a..48fd5b9abc1b 100644
--- 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"
--
GitLab