summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolegendo <olegendo@138bc75d-0d04-0410-961f-82ee72b054a4>2018-01-21 05:13:20 +0000
committerolegendo <olegendo@138bc75d-0d04-0410-961f-82ee72b054a4>2018-01-21 05:13:20 +0000
commit5dd5df6046bb418a5bc970499e4a228a5e74deef (patch)
treeaa19b20447d81286cf8d71800263d0457acd112d
parentf4e4eee3d7fbc5f2cd9b78adafff4b50c32bd4e4 (diff)
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256928 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/config/sh/sh_optimize_sett_clrt.cc5
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 51ab249a6b44..24714ea2a683 100644
--- 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-17 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
Backport from mainline
diff --git a/gcc/config/sh/sh_optimize_sett_clrt.cc b/gcc/config/sh/sh_optimize_sett_clrt.cc
index 449261e86de4..ca3440a79a24 100644
--- 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