From 5995f59725f7c9873a34a5f851df43cc777dd961 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 13 Feb 2017 22:54:01 +0100
Subject: [PATCH] init.c (warn_placement_new_too_small): Add missing space in
 diagnostics.

	* init.c (warn_placement_new_too_small): Add missing space in
	diagnostics.
	* parser.c (cp_parser_oacc_declare): Likewise.
	* mangle.c (maybe_check_abi_tags): Likewise.

From-SVN: r245407
---
 gcc/cp/ChangeLog | 5 +++++
 gcc/cp/init.c    | 2 +-
 gcc/cp/mangle.c  | 5 +++--
 gcc/cp/parser.c  | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3fffb5b04b6..994492be7d9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2017-02-13  Jakub Jelinek  <jakub@redhat.com>
 
+	* init.c (warn_placement_new_too_small): Add missing space in
+	diagnostics.
+	* parser.c (cp_parser_oacc_declare): Likewise.
+	* mangle.c (maybe_check_abi_tags): Likewise.
+
 	PR c++/79232
 	* typeck.c (cp_build_modify_expr): Handle properly COMPOUND_EXPRs
 	on lhs that have {PRE{DEC,INC}REMENT,MODIFY,MIN,MAX,COND}_EXPR
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 524c583138f..c8fb3399570 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2606,7 +2606,7 @@ warn_placement_new_too_small (tree type, tree nelts, tree size, tree oper)
 			exact_size ?
 			"placement new constructing an object of type %qT "
 			"and size %qwu in a region of type %qT and size %qwi"
-			: "placement new constructing an object of type %qT"
+			: "placement new constructing an object of type %qT "
 			"and size %qwu in a region of type %qT and size "
 			"at most %qwu",
 			type, bytes_need, TREE_TYPE (oper),
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 38b6a635704..3ead33e4bfa 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -4274,8 +4274,9 @@ maybe_check_abi_tags (tree t, tree for_decl, int ver)
 		    for_decl, flag_abi_version, warn_abi_version);
       else
 	warning_at (DECL_SOURCE_LOCATION (t), OPT_Wabi,
-		    "the mangled name of the initialization guard variable for"
-		    "%qD changes between -fabi-version=%d and -fabi-version=%d",
+		    "the mangled name of the initialization guard variable "
+		    "for %qD changes between -fabi-version=%d and "
+		    "-fabi-version=%d",
 		    t, flag_abi_version, warn_abi_version);
     }
 }
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 8812f8ce77b..ce45bbaedea 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -36177,7 +36177,7 @@ cp_parser_oacc_declare (cp_parser *parser, cp_token *pragma_tok)
 	       || !DECL_EXTERNAL (decl)))
 	    {
 	      error_at (loc,
-			"%qD must be a global variable in"
+			"%qD must be a global variable in "
 			"%<#pragma acc declare link%>",
 			decl);
 	      error = true;