From: hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 17 Jul 2014 02:03:11 +0000 (+0000)
Subject: 	* config.gcc (crisv32-*-linux* | cris-*-linux*): Do not override
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f01c257a25ffc68ffc0d44a4ed1861038dd8f6a9;p=thirdparty%2Fgcc.git

	* config.gcc (crisv32-*-linux* | cris-*-linux*): Do not override
	an existing tmake_file.  Don't add t-slibgcc and t-linux.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212707 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 66ea5a949d5c..8e1047964899 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.gcc (crisv32-*-linux* | cris-*-linux*): Do not override
+	an existing tmake_file.  Don't add t-slibgcc and t-linux.
+
 2014-07-17  Jason Merrill  <jason@redhat.com>
 
 	PR c++/61623
diff --git a/gcc/config.gcc b/gcc/config.gcc
index cfb50140a04a..aa2d1a978971 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1121,8 +1121,7 @@ cris-*-elf | cris-*-none)
 	;;
 crisv32-*-linux* | cris-*-linux*)
 	tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h glibc-stdint.h cris/linux.h"
-	# We need to avoid using t-linux, so override default tmake_file
-	tmake_file="cris/t-cris cris/t-linux t-slibgcc t-linux"
+	tmake_file="${tmake_file} cris/t-cris cris/t-linux"
 	extra_options="${extra_options} cris/linux.opt"
 	case $target in
 	  cris-*-*)