backport: re PR target/80870 (ICE building 7.1.0 sh-elf crosscompiler on macOS)

	Backport from mainline
	2018-01-21  Oleg Endo  <olegendo@gcc.gnu.org>

	PR target/80870
	* config/sh/sh_optimize_sett_clrt.cc:
	Use INCLUDE_ALGORITHM and INCLUDE_VECTOR instead of direct includes.

From-SVN: r256929

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdd50afb226c694caaae6f7529d77b00e61be81e..a2a3a9cbffd34f9531d6d7049e7825e3a9e852fa 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-21  Oleg Endo  <olegendo@gcc.gnu.org>
+
+       Backport from mainline
+       2018-01-21  Oleg Endo  <olegendo@gcc.gnu.org>
+
+       PR target/80870
+       * config/sh/sh_optimize_sett_clrt.cc:
+       Use INCLUDE_ALGORITHM and INCLUDE_VECTOR instead of direct includes.
+
 2018-01-16  Segher Boessenkool  <segher@kernel.crashing.org>
 
        Backport from mainline

diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index 11285dc112de99a5284e46a1003ddaf52603df2d..43f2e30deb2d0bac25a23fb885f197886453d1a1 100644 (file)
--- a/gcc/config/sh/sh_optimize_sett_clrt.cc
+++ b/gcc/config/sh/sh_optimize_sett_clrt.cc
@@ -18,6 +18,8 @@ along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
+#define INCLUDE_ALGORITHM
+#define INCLUDE_VECTOR
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
@@ -27,9 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "cfgrtl.h"
 #include "tree-pass.h"
 
-#include <vector>
-#include <algorithm>
-
 /*
 This pass tries to eliminate unnecessary sett or clrt instructions in cases
 where the ccreg value is already known to be the same as the constant set