From: Martin Liska <mliska@suse.cz>
Date: Fri, 10 May 2019 06:31:32 +0000 (+0200)
Subject: Fix location where lto-dump is installed.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38613b9baa4237c8b730a63742ba606cb97f6a9f;p=gcc.git

Fix location where lto-dump is installed.

2019-05-10  Martin Liska  <mliska@suse.cz>

	* Make-lang.in: Use program_transform_name for lto-dump.
	* config-lang.in: Do not mark lto-dump compiler as we don't
	want to have it installed at
	lib/gcc/x86_64-pc-linux-gnu/10.0.0/lto-dump.

From-SVN: r271052
---

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 942b4b51e10..64b19420caa 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-10  Martin Liska  <mliska@suse.cz>
+
+	* Make-lang.in: Use program_transform_name for lto-dump.
+	* config-lang.in: Do not mark lto-dump compiler as we don't
+	want to have it installed at
+	lib/gcc/x86_64-pc-linux-gnu/10.0.0/lto-dump.
+
 2019-05-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* lto-common.c (lto_file_read): Print section->start as int64_t,
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index 92487e1f53e..afcfc9893b4 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -22,6 +22,7 @@
 # The name of the LTO compiler.
 LTO_EXE = lto1$(exeext)
 LTO_DUMP_EXE = lto-dump$(exeext)
+LTO_DUMP_INSTALL_NAME := $(shell echo lto-dump|sed '$(program_transform_name)')
 # The LTO-specific object files inclued in $(LTO_EXE).
 LTO_OBJS = lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o lto/lto-common.o
 lto_OBJS = $(LTO_OBJS)
@@ -48,7 +49,7 @@ lto.rest.encap:
 lto.tags:
 lto.install-common: installdirs
 	$(INSTALL_PROGRAM) $(LTO_DUMP_EXE) \
-	$(DESTDIR)/$(bindir)/$(LTO_DUMP_EXE)
+	$(DESTDIR)/$(bindir)/$(LTO_DUMP_INSTALL_NAME)$(exeext)
 
 lto.install-man:
 lto.install-info:
diff --git a/gcc/lto/config-lang.in b/gcc/lto/config-lang.in
index 37c8f6e12b1..c7aa41f076b 100644
--- a/gcc/lto/config-lang.in
+++ b/gcc/lto/config-lang.in
@@ -18,7 +18,7 @@
 # <http://www.gnu.org/licenses/>.
 
 language="lto"
-compilers="lto1\$(exeext) lto-dump\$(exeext)"
+compilers="lto1\$(exeext)"
 
 gtfiles="\$(srcdir)/lto/lto-tree.h \$(srcdir)/lto/lto-lang.c \$(srcdir)/lto/lto.c \$(srcdir)/lto/lto.h \$(srcdir)/lto/lto-common.h \$(srcdir)/lto/lto-common.c \$(srcdir)/lto/lto-dump.c"