From 797fb6330503de95edbdd67398bdf345977279de Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 6 Jul 2018 15:29:46 -0400
Subject: [PATCH 38/46] FIXME: move prototype of remark to its own header file

---
 gcc/diagnostic-core.h           |  2 --
 gcc/diagnostic-remark.h         | 27 +++++++++++++++++++++++++++
 gcc/diagnostic.c                |  1 +
 gcc/optinfo-emit-diagnostics.cc |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 gcc/diagnostic-remark.h

diff --git a/gcc/diagnostic-core.h b/gcc/diagnostic-core.h
index e241564..aa5807e 100644
--- a/gcc/diagnostic-core.h
+++ b/gcc/diagnostic-core.h
@@ -69,8 +69,6 @@ extern bool warning_at (location_t, int, const char *, ...)
     ATTRIBUTE_GCC_DIAG(3,4);
 extern bool warning_at (rich_location *, int, const char *, ...)
     ATTRIBUTE_GCC_DIAG(3,4);
-extern bool remark (location_t, const char *, ...)
-    ATTRIBUTE_GCC_DIAG(2,3);
 extern void error (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
 extern void error_n (location_t, unsigned HOST_WIDE_INT, const char *,
 		     const char *, ...)
diff --git a/gcc/diagnostic-remark.h b/gcc/diagnostic-remark.h
new file mode 100644
index 0000000..178bfe3
--- /dev/null
+++ b/gcc/diagnostic-remark.h
@@ -0,0 +1,27 @@
+/* Optimization remarks.
+   Copyright (C) 2018 Free Software Foundation, Inc.
+   Contributed by David Malcolm <dmalcolm@redhat.com>.
+
+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/>.  */
+
+#ifndef GCC_DIAGNOSTIC_REMARK_H
+#define GCC_DIAGNOSTIC_REMARK_H
+
+extern bool remark (location_t, const char *, ...)
+  ATTRIBUTE_GCC_DIAG(2,3);
+
+#endif /* ! GCC_DIAGNOSTIC_REMARK_H */
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 562d18e..bc7603e 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "backtrace.h"
 #include "diagnostic.h"
 #include "diagnostic-color.h"
+#include "diagnostic-remark.h"
 #include "edit-context.h"
 #include "selftest.h"
 #include "selftest-diagnostic.h"
diff --git a/gcc/optinfo-emit-diagnostics.cc b/gcc/optinfo-emit-diagnostics.cc
index 285cb3f..ebed539 100644
--- a/gcc/optinfo-emit-diagnostics.cc
+++ b/gcc/optinfo-emit-diagnostics.cc
@@ -31,6 +31,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-pretty-print.h"
 #include "diagnostic.h"
 #include "diagnostic-color.h"
+#include "diagnostic-remark.h"
 #include "options.h"
 #include "cgraph.h"
 
-- 
1.8.5.3