From 765f8786cf6e22aa6309f321f0afd8e7dc79b4bb Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 9 Apr 2019 12:27:14 +0200
Subject: [PATCH] re PR translation/90011 (trailing space in diagnostic)

	PR translation/90011
	* ipa-devirt.c (compare_virtual_tables): Remove two trailing spaces
	from diagnostics.
	* config/arm/freebsd.h (LINK_SPEC): Remove trailing space from -p
	diagnostics.
	* config/riscv/freebsd.h (LINK_SPEC): Likewise.
	* config/aarch64/aarch64-freebsd.h (FBSD_TARGET_LINK_SPEC): Likewise.
	* config/darwin.h (DRIVER_SELF_SPECS, ASM_FINAL_SPEC): Remove
	trailing space from -gsplit-dwarf diagnostics.

From-SVN: r270225
---
 gcc/ChangeLog                        | 10 ++++++++++
 gcc/config/aarch64/aarch64-freebsd.h |  2 +-
 gcc/config/arm/freebsd.h             |  2 +-
 gcc/config/darwin.h                  |  4 ++--
 gcc/config/riscv/freebsd.h           |  2 +-
 gcc/ipa-devirt.c                     |  2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0d6abc..7136f6b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
 2019-04-09  Jakub Jelinek  <jakub@redhat.com>
 
+	PR translation/90011
+	* ipa-devirt.c (compare_virtual_tables): Remove two trailing spaces
+	from diagnostics.
+	* config/arm/freebsd.h (LINK_SPEC): Remove trailing space from -p
+	diagnostics.
+	* config/riscv/freebsd.h (LINK_SPEC): Likewise.
+	* config/aarch64/aarch64-freebsd.h (FBSD_TARGET_LINK_SPEC): Likewise.
+	* config/darwin.h (DRIVER_SELF_SPECS, ASM_FINAL_SPEC): Remove
+	trailing space from -gsplit-dwarf diagnostics.
+
 	PR tree-optimization/89998
 	* gimple-ssa-sprintf.c (try_substitute_return_value): Use lhs type
 	instead of integer_type_node if possible, don't add ranges if return
diff --git a/gcc/config/aarch64/aarch64-freebsd.h b/gcc/config/aarch64/aarch64-freebsd.h
index bdc294a..899e6f9 100644
--- a/gcc/config/aarch64/aarch64-freebsd.h
+++ b/gcc/config/aarch64/aarch64-freebsd.h
@@ -34,7 +34,7 @@
 
 #undef  FBSD_TARGET_LINK_SPEC
 #define FBSD_TARGET_LINK_SPEC "                                 \
-    %{p:%nconsider using `-pg' instead of `-p' with gprof (1) } \
+    %{p:%nconsider using `-pg' instead of `-p' with gprof (1)}  \
     %{v:-V}                                                     \
     %{assert*} %{R*} %{rpath*} %{defsym*}                       \
     %{shared:-Bshareable %{h*} %{soname*}}                      \
diff --git a/gcc/config/arm/freebsd.h b/gcc/config/arm/freebsd.h
index 5d629cb..ed8d406 100644
--- a/gcc/config/arm/freebsd.h
+++ b/gcc/config/arm/freebsd.h
@@ -46,7 +46,7 @@
 
 #undef	LINK_SPEC
 #define LINK_SPEC "							\
-  %{p:%nconsider using `-pg' instead of `-p' with gprof (1) }		\
+  %{p:%nconsider using `-pg' instead of `-p' with gprof (1)}		\
   %{v:-V}								\
   %{assert*} %{R*} %{rpath*} %{defsym*}					\
   %{shared:-Bshareable %{h*} %{soname*}}				\
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 8c197e6..0e253cb 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -123,7 +123,7 @@ extern GTY(()) int darwin_ms_struct;
   "%{gused:-g -feliminate-unused-debug-symbols} %<gused",	\
   "%{fapple-kext|mkernel:-static}",				\
   "%{shared:-Zdynamiclib} %<shared",                            \
-  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform } \
+  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} \
      %<gsplit-dwarf"
 
 #define DARWIN_CC1_SPEC							\
@@ -424,7 +424,7 @@ extern GTY(()) int darwin_ms_struct;
 
 #define ASM_DEBUG_SPEC  "%{g*:%{%:debug-level-gt(0):%{!gdwarf*:--gstabs}}}"
 #define ASM_FINAL_SPEC \
-  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform } %<gsplit-dwarf"
+  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %<gsplit-dwarf"
 
 /* We still allow output of STABS if the assembler supports it.  */
 #ifdef HAVE_AS_STABS_DIRECTIVE
diff --git a/gcc/config/riscv/freebsd.h b/gcc/config/riscv/freebsd.h
index 4e7e7ff..13d04cc 100644
--- a/gcc/config/riscv/freebsd.h
+++ b/gcc/config/riscv/freebsd.h
@@ -41,7 +41,7 @@ along with GCC; see the file COPYING3.  If not see
 #undef LINK_SPEC
 #define LINK_SPEC "						\
   -melf" XLEN_SPEC "lriscv					\
-  %{p:%nconsider using `-pg' instead of `-p' with gprof (1) }	\
+  %{p:%nconsider using `-pg' instead of `-p' with gprof (1)}	\
   %{v:-V}							\
   %{assert*} %{R*} %{rpath*} %{defsym*}				\
   %{shared:-Bshareable %{h*} %{soname*}}			\
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 6d891e8..61e4efc 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -874,7 +874,7 @@ compare_virtual_tables (varpool_node *prevailing, varpool_node *vtable)
 				(TYPE_NAME (DECL_CONTEXT (vtable->decl))),
 			      OPT_Wodr,
 			      "virtual table of type %qD violates "
-			      "one definition rule  ",
+			      "one definition rule",
 			      DECL_CONTEXT (vtable->decl)))
 		{
 		  inform (DECL_SOURCE_LOCATION
-- 
2.7.4