diff options
| author | bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-04-29 16:52:45 +0000 |
|---|---|---|
| committer | bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-04-29 16:52:45 +0000 |
| commit | 162f9d1ef42d8e551cf9d27b61e78bea81ddc13d (patch) | |
| tree | 43954c0b36be2904d356738ea45ea25f8ef192bd | |
| parent | df615909263269988fd9611f8d007902580829d9 (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222585 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libgcc/ChangeLog | 8 | ||||
| -rw-r--r-- | libgcc/Makefile.in | 3 | ||||
| -rw-r--r-- | libgcc/configure | 10 | ||||
| -rw-r--r-- | libgcc/configure.ac | 9 |
4 files changed, 17 insertions, 13 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index b18c7aed9b8..39c9433d644 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 88ddfea18eb..1ab188d6321 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 08c931929c7..e911a9dcb46 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 1c405e8dfe5..48fd5b9abc1 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" |