OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix libgcc installation for offload targets.

Browse Source 
* 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
This commit is contained in:
Bernd Schmidt 2015-04-29 16:52:45 +00:00 committed by Bernd Schmidt
parent f82a9d904e
commit d28ad5d4c5
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgcc/ChangeLog
View File

@ -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> 2015-04-28 Uros Bizjak <ubizjak@gmail.com>
* config/frv/elf-lib.h: New file. * config/frv/elf-lib.h: New file.

3
libgcc/Makefile.in
View File

@ -45,6 +45,7 @@ fixed_point = @fixed_point@
with_aix_soname = @with_aix_soname@ with_aix_soname = @with_aix_soname@
host_noncanonical = @host_noncanonical@ host_noncanonical = @host_noncanonical@
real_host_noncanonical = @real_host_noncanonical@
target_noncanonical = @target_noncanonical@ target_noncanonical = @target_noncanonical@
# List of extra object files that should be compiled for this target machine. # List of extra object files that should be compiled for this target machine.
@ -185,7 +186,7 @@ STRIP = @STRIP@
STRIP_FOR_TARGET = $(STRIP) STRIP_FOR_TARGET = $(STRIP)
# Directory in which the compiler finds libraries etc. # 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. # Used to install the shared libgcc.
slibdir = @slibdir@ slibdir = @slibdir@
# Maybe used for DLLs on Windows targets. # Maybe used for DLLs on Windows targets.

10
libgcc/configure vendored
View File

@ -566,6 +566,7 @@ sfp_machine_header
set_use_emutls set_use_emutls
set_have_cc_tls set_have_cc_tls
vis_hide vis_hide
real_host_noncanonical
accel_dir_suffix accel_dir_suffix
force_explicit_eh_registry force_explicit_eh_registry
fixed_point fixed_point
@ -4778,17 +4779,14 @@ esac
# Used for constructing correct paths for offload compilers. # Used for constructing correct paths for offload compilers.
accel_dir_suffix= accel_dir_suffix=
real_host_noncanonical=${host_noncanonical}
if test x"$enable_as_accelerator_for" != x; then if test x"$enable_as_accelerator_for" != x; then
accel_dir_suffix=/accel/${target_noncanonical} accel_dir_suffix=/accel/${target_noncanonical}
case "${target_noncanonical}" in real_host_noncanonical=${enable_as_accelerator_for}
*-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
fi fi
if test x"$enable_offload_targets" != x; then if test x"$enable_offload_targets" != x; then
extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o" extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o"
fi fi

9
libgcc/configure.ac
View File

@ -403,16 +403,13 @@ esac
# Used for constructing correct paths for offload compilers. # Used for constructing correct paths for offload compilers.
accel_dir_suffix= accel_dir_suffix=
real_host_noncanonical=${host_noncanonical}
if test x"$enable_as_accelerator_for" != x; then if test x"$enable_as_accelerator_for" != x; then
accel_dir_suffix=/accel/${target_noncanonical} accel_dir_suffix=/accel/${target_noncanonical}
case "${target_noncanonical}" in real_host_noncanonical=${enable_as_accelerator_for}
*-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
fi fi
AC_SUBST(accel_dir_suffix) AC_SUBST(accel_dir_suffix)
AC_SUBST(real_host_noncanonical)
if test x"$enable_offload_targets" != x; then if test x"$enable_offload_targets" != x; then
extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o" extra_parts="${extra_parts} crtoffloadbegin.o crtoffloadend.o"