diagnostics: gcc/diagnostic-url.h -> gcc/diagnostics/url.h

No functional change intended.

gcc/ChangeLog:
	* common.opt: Update for move of diagnostic-url.h to
	diagnostics/url.h.
	* diagnostic.cc: Likewise.
	* diagnostics/color.cc: Likewise.
	* diagnostics/text-sink.cc: Likewise.
	* diagnostic-url.h: Move to...
	* diagnostics/url.h: ...here.
	* libgdiagnostics.cc: Update for move of diagnostic-url.h to
	diagnostics/url.h.
	* pretty-print.h: Likewise.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

diff --git a/gcc/common.opt b/gcc/common.opt
index 0c9d01019128ef6d033f9ec12c1e4dc548699c79..70659fabebd5110f2a0e7102552c2232339ea7bf 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1471,7 +1471,7 @@ Driver Common Joined RejectNegative Var(flag_diagnostics_show_urls) Enum(diagnos
 
 ; Required for these enum values.
 SourceInclude
-diagnostic-url.h
+diagnostics/url.h
 
 Enum
 Name(diagnostic_url_rule) Type(int)

diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc
index c6e5523b974a503e2391bbd5237e3d2dc7680582..74a3a0b0af4f86177c08d381a5a9fcc14d02dc9b 100644 (file)
--- a/gcc/diagnostic.cc
+++ b/gcc/diagnostic.cc
@@ -32,7 +32,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "backtrace.h"
 #include "diagnostic.h"
 #include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/paths.h"
 #include "diagnostics/client-data-hooks.h"

diff --git a/gcc/diagnostics/color.cc b/gcc/diagnostics/color.cc
index 68a50f2e5001ba9aaf46d6bb72aa7a7e44bd566d..622027b4c0e1e47fc7bce06b5b9c17567e2d3460 100644 (file)
--- a/gcc/diagnostics/color.cc
+++ b/gcc/diagnostics/color.cc
@@ -20,7 +20,7 @@
 #define INCLUDE_VECTOR
 #include "system.h"
 #include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
 #include "label-text.h"
 
 #ifdef __MINGW32__

diff --git a/gcc/diagnostics/text-sink.cc b/gcc/diagnostics/text-sink.cc
index a602e23f7d1a811d00ad9d9a8e311812825204a0..6fdbf22308f02f121adbab017d1388cd12cee79d 100644 (file)
--- a/gcc/diagnostics/text-sink.cc
+++ b/gcc/diagnostics/text-sink.cc
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "diagnostic.h"
 #include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/paths.h"
 #include "diagnostics/client-data-hooks.h"

diff --git a/gcc/diagnostic-url.h b/gcc/diagnostics/url.h
similarity index 93%
rename from gcc/diagnostic-url.h
rename to gcc/diagnostics/url.h
index d54775b79bd6fc809217809a6bd2d67acf4bdc9c..89efa362d5d005da1f4193f325e4939db0a5c469 100644 (file)
--- a/gcc/diagnostic-url.h
+++ b/gcc/diagnostics/url.h
@@ -17,8 +17,8 @@ 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_URL_H
-#define GCC_DIAGNOSTIC_URL_H
+#ifndef GCC_DIAGNOSTICS_URL_H
+#define GCC_DIAGNOSTICS_URL_H
 
 /* Whether to add URLs to diagnostics:
    - DIAGNOSTICS_URL_NO: never
@@ -49,4 +49,4 @@ const diagnostic_url_format URL_FORMAT_DEFAULT = URL_FORMAT_BEL;
 
 extern diagnostic_url_format determine_url_format (diagnostic_url_rule_t);
 
-#endif /* ! GCC_DIAGNOSTIC_URL_H */
+#endif /* ! GCC_DIAGNOSTICS_URL_H */

diff --git a/gcc/libgdiagnostics.cc b/gcc/libgdiagnostics.cc
index 868f9db731f1a734b06f6c4f2e3023f7af6c84ff..0bd4b1263f6aa4bbbba740defb85799e14922539 100644 (file)
--- a/gcc/libgdiagnostics.cc
+++ b/gcc/libgdiagnostics.cc
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "diagnostic.h"
 #include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
 #include "diagnostics/metadata.h"
 #include "diagnostics/paths.h"
 #include "diagnostics/client-data-hooks.h"

diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 6cd9150a9d08de8a5b81280b4da31d048638148d..ced2e3cec47b71962cefb98f2ac7515d6c3e1050 100644 (file)
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "obstack.h"
 #include "rich-location.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
 
 /* Maximum number of format string arguments.  */
 #define PP_NL_ARGMAX   30