diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2014-07-17 02:03:11 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2014-07-17 02:03:11 +0000 |
| commit | 3a213afbb56ec69625a816642391f0b7294b797a (patch) | |
| tree | e3936c591fe2f507b83be88e69717251f6579b01 | |
| parent | c6f884c0e075196f9770f466fec2a2e507a1c909 (diff) | |
| download | gcc-3a213afbb56ec69625a816642391f0b7294b797a.tar.gz | |
config.gcc (crisv32-*-linux* | cris-*-linux*): Do not override an existing tmake_file.
* config.gcc (crisv32-*-linux* | cris-*-linux*): Do not override
an existing tmake_file. Don't add t-slibgcc and t-linux.
From-SVN: r212707
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config.gcc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 66ea5a949d5..8e104796489 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 cfb50140a04..aa2d1a97897 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-*-*) |