diff options
author | Kaz Kojima <kkojima@gcc.gnu.org> | 2014-12-05 06:10:08 +0000 |
---|---|---|
committer | Kaz Kojima <kkojima@gcc.gnu.org> | 2014-12-05 06:10:08 +0000 |
commit | 9d2ec52096c15275e5e042173d82605b29922c9f (patch) | |
tree | b7572de45aaa8b670732e1d50a3fd481bada950d | |
parent | 4b5de9cffeab53899f4097236301a98cb8f1c6bd (diff) |
Fix merge failure: Remove files deleted on trunk already. Fix trivial thinko.sh-lra
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/sh-lra@218414 138bc75d-0d04-0410-961f-82ee72b054a4
14 files changed, 2 insertions, 446 deletions
diff --git a/gcc/config/mips/gnu-user64.h b/gcc/config/mips/gnu-user64.h deleted file mode 100644 index b97b4a76848..00000000000 --- a/gcc/config/mips/gnu-user64.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Definitions for MIPS systems using GNU userspace and n32/64 abi. - Copyright (C) 2002-2014 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING3. If not see -<http://www.gnu.org/licenses/>. */ - -/* Force the default endianness and ABI flags onto the command line - in order to make the other specs easier to write. */ - -#define LINUX64_DRIVER_SELF_SPECS \ - LINUX_DRIVER_SELF_SPECS \ - " %{!EB:%{!EL:%(endian_spec)}}" \ - " %{!mabi=*: -" MULTILIB_ABI_DEFAULT "}" - -#undef DRIVER_SELF_SPECS -#define DRIVER_SELF_SPECS \ - BASE_DRIVER_SELF_SPECS, \ - LINUX64_DRIVER_SELF_SPECS - -#undef GNU_USER_TARGET_LINK_SPEC -#define GNU_USER_TARGET_LINK_SPEC "\ -%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} %{mips4} \ -%{shared} \ - %(endian_spec) \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - %{mabi=n32: -dynamic-linker " GNU_USER_DYNAMIC_LINKERN32 "} \ - %{mabi=64: -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "} \ - %{mabi=32: -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \ - %{static:-static}} \ -%{mabi=n32:-m" GNU_USER_LINK_EMULATIONN32 "} \ -%{mabi=64:-m" GNU_USER_LINK_EMULATION64 "} \ -%{mabi=32:-m" GNU_USER_LINK_EMULATION32 "}" -#undef LINK_SPEC -#define LINK_SPEC GNU_USER_TARGET_LINK_SPEC - -#undef LOCAL_LABEL_PREFIX -#define LOCAL_LABEL_PREFIX (TARGET_OLDABI ? "$" : ".") diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h deleted file mode 100644 index 7ad3b2af2b9..00000000000 --- a/gcc/config/mips/linux64.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Definitions for MIPS running Linux-based GNU systems with ELF format - using n32/64 abi. - Copyright (C) 2002-2014 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING3. If not see -<http://www.gnu.org/licenses/>. */ - -#define GNU_USER_LINK_EMULATION32 "elf32%{EB:b}%{EL:l}tsmip" -#define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" -#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" - -#define GLIBC_DYNAMIC_LINKER32 \ - "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" -#define GLIBC_DYNAMIC_LINKER64 \ - "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}" -#define GLIBC_DYNAMIC_LINKERN32 \ - "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}" - -#undef UCLIBC_DYNAMIC_LINKER32 -#define UCLIBC_DYNAMIC_LINKER32 \ - "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" -#undef UCLIBC_DYNAMIC_LINKER64 -#define UCLIBC_DYNAMIC_LINKER64 \ - "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}" -#define UCLIBC_DYNAMIC_LINKERN32 \ - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - -#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" -#define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ - BIONIC_DYNAMIC_LINKERN32) diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index ffaa0bfc688..1bf27db69f6 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -1788,7 +1788,7 @@ prepare_move_operands (rtx operands[], machine_mode mode) We split possible load/store to two move insns via r0 so as to shorten R0 live range. It will make some codes worse but will win on avarage for LRA. */ - else if (TARGET_LRA_P + else if (sh_lra_p () && TARGET_SH1 && ! TARGET_SH2A && (mode == QImode || mode == HImode) && ((REG_P (operands[0]) && MEM_P (operands[1])) @@ -10521,7 +10521,7 @@ sh_legitimize_reload_address (rtx *p, machine_mode mode, int opnum, enum reload_type type = (enum reload_type) itype; const int mode_sz = GET_MODE_SIZE (mode); - if (TARGET_LRA_P) + if (sh_lra_p ()) return false; if (! ALLOW_INDEXED_ADDRESS diff --git a/libstdc++-v3/testsuite/20_util/add_lvalue_reference/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/add_lvalue_reference/requirements/typedefs.cc deleted file mode 100644 index b1685442f10..00000000000 --- a/libstdc++-v3/testsuite/20_util/add_lvalue_reference/requirements/typedefs.cc +++ /dev/null @@ -1,30 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - - -// NB: This file is for testing type_traits with NO OTHER INCLUDES. - -#include <type_traits> - -using namespace std; - -static_assert( is_same<typename add_lvalue_reference<long>::type, - add_lvalue_reference_t<long>>(), - "add_lvalue_reference_t" ); diff --git a/libstdc++-v3/testsuite/20_util/add_rvalue_reference/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/add_rvalue_reference/requirements/typedefs.cc deleted file mode 100644 index ac1ecef8885..00000000000 --- a/libstdc++-v3/testsuite/20_util/add_rvalue_reference/requirements/typedefs.cc +++ /dev/null @@ -1,30 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - - -// NB: This file is for testing type_traits with NO OTHER INCLUDES. - -#include <type_traits> - -using namespace std; - -static_assert( is_same<typename add_rvalue_reference<long>::type, - add_rvalue_reference_t<long>>(), - "add_rvalue_reference_t" ); diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-3.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-3.cc deleted file mode 100644 index 63f594501a9..00000000000 --- a/libstdc++-v3/testsuite/20_util/common_type/requirements/typedefs-3.cc +++ /dev/null @@ -1,27 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } -// -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -static_assert( is_same<common_type<int, long, char, unsigned>::type, - common_type_t<int, long, char, unsigned>>(), - "common_type_t" ); diff --git a/libstdc++-v3/testsuite/20_util/conditional/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/conditional/requirements/typedefs-2.cc deleted file mode 100644 index a64538b3d24..00000000000 --- a/libstdc++-v3/testsuite/20_util/conditional/requirements/typedefs-2.cc +++ /dev/null @@ -1,33 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - - -// NB: This file is for testing type_traits with NO OTHER INCLUDES. - -#include <type_traits> - -using namespace std; - -static_assert( is_same<typename conditional<true, long, void>::type, - conditional_t<true, long, void>>(), - "conditional_t<true, ...>" ); -static_assert( is_same<typename conditional<false, long, void>::type, - conditional_t<false, long, void>>(), - "conditional_t<false, ...>" ); diff --git a/libstdc++-v3/testsuite/20_util/decay/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/decay/requirements/typedefs-2.cc deleted file mode 100644 index 468ba814bd2..00000000000 --- a/libstdc++-v3/testsuite/20_util/decay/requirements/typedefs-2.cc +++ /dev/null @@ -1,35 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -template<typename Trait, typename Result> - using test = is_same<typename Trait::type, Result>; - -static_assert( test<decay<bool>, decay_t<bool>>(), "decay<bool>" ); -static_assert( test<decay<const int>, decay_t<const int>>(), - "decay<const int>" ); -static_assert( test<decay<int[4]>, decay_t<int[4]>>(), "decay<int[4]>" ); -typedef void (fn_type) (); -static_assert( test<decay<fn_type>, decay_t<fn_type>>(), "decay<fn_type>" ); -typedef void (cfn_type) () const; -static_assert( test<decay<cfn_type>, decay_t<cfn_type>>(), "decay<cfn_type>" ); diff --git a/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs-2.cc deleted file mode 100644 index 4c46da9914b..00000000000 --- a/libstdc++-v3/testsuite/20_util/enable_if/requirements/typedefs-2.cc +++ /dev/null @@ -1,29 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++1y" } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -static_assert( is_same<enable_if<true>::type, enable_if_t<true>>(), - "enable_if_t<true>" ); -struct X; -static_assert( is_same<enable_if<true, X>::type, enable_if_t<true, X>>(), - "enable_if_t<true, X>" ); diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-3.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-3.cc deleted file mode 100644 index 16c7c90c59d..00000000000 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-3.cc +++ /dev/null @@ -1,35 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -template<typename Trait, typename Result> - using test = is_same<typename Trait::type, Result>; - -static_assert( test<make_signed<const int>, make_signed_t<const int>>(), - "make_signed_t<const int>" ); - -static_assert( test<make_signed<unsigned>, make_signed_t<unsigned>>(), - "make_signed_t<unsigned>" ); - -static_assert( test<make_signed<char>, make_signed_t<char>>(), - "make_signed_t<char>" ); diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-3.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-3.cc deleted file mode 100644 index 5bdea5dc93f..00000000000 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-3.cc +++ /dev/null @@ -1,35 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -template<typename Trait, typename Result> - using test = is_same<typename Trait::type, Result>; - -static_assert( test<make_unsigned<const int>, make_unsigned_t<const int>>(), - "make_unsigned_t<const int>" ); - -static_assert( test<make_unsigned<unsigned>, make_unsigned_t<unsigned>>(), - "make_unsigned_t<unsigned>" ); - -static_assert( test<make_unsigned<char>, make_unsigned_t<char>>(), - "make_unsigned_t<char>" ); diff --git a/libstdc++-v3/testsuite/20_util/remove_reference/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/remove_reference/requirements/typedefs.cc deleted file mode 100644 index 9c06e3b00c6..00000000000 --- a/libstdc++-v3/testsuite/20_util/remove_reference/requirements/typedefs.cc +++ /dev/null @@ -1,30 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -static_assert( is_same<remove_reference<int>::type, remove_reference_t<int>>(), - "remove_reference_t<int>" ); -static_assert( is_same<remove_reference<int&>::type, remove_reference_t<int&>>(), - "remove_reference_t<int&>" ); -static_assert( is_same<remove_reference<int&&>::type, remove_reference_t<int&&>>(), - "remove_reference_t<int&&>" ); diff --git a/libstdc++-v3/testsuite/20_util/result_of/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/result_of/requirements/typedefs.cc deleted file mode 100644 index 730a66d303c..00000000000 --- a/libstdc++-v3/testsuite/20_util/result_of/requirements/typedefs.cc +++ /dev/null @@ -1,32 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } - -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -#include <type_traits> - -using namespace std; - -using F1 = char(*)(char); -static_assert( is_same<result_of<F1(int)>::type, result_of_t<F1(int)>>(), - "result_of_t<F1(int)>" ); - -struct X { }; -using F2 = int X::*; -static_assert( is_same<result_of<F2(X)>::type, result_of_t<F2(X)>>(), - "result_of_t<F2(X)>" ); diff --git a/libstdc++-v3/testsuite/20_util/underlying_type/requirements/typedefs-3.cc b/libstdc++-v3/testsuite/20_util/underlying_type/requirements/typedefs-3.cc deleted file mode 100644 index 78090b7dd3c..00000000000 --- a/libstdc++-v3/testsuite/20_util/underlying_type/requirements/typedefs-3.cc +++ /dev/null @@ -1,32 +0,0 @@ -// { dg-options "-std=gnu++1y" } -// { dg-do compile } -// -// Copyright (C) 2013-2014 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 3, or (at your option) -// any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// -// NB: This file is for testing type_traits with NO OTHER INCLUDES. - -#include <type_traits> - -using namespace std; - -enum E : long { }; - -static_assert( is_same<typename underlying_type<E>::type, - underlying_type_t<E>>(), - "underlying_type_t" ); |