23 files changed, 9 insertions, 2 deletions

diff --git a/gcc-4.9/libcpp/ChangeLog b/gcc-4.9/libcpp/ChangeLog
index 41510d222..e0e39e37f 100644
--- a/gcc-4.9/libcpp/ChangeLog
+++ b/gcc-4.9/libcpp/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-09  Edward Smith-Rowland  <3dw4rd@verizon.net>
+
+	PR c++/58155 - -Wliteral-suffix warns about tokens which are skipped
+	by preprocessor
+	* lex.c (lex_raw_string ()): Do not warn about invalid suffix
+	if skipping. (lex_string ()): Ditto.
+
 2014-04-22  Release Manager
 
 	* GCC 4.9.0 released.
diff --git a/gcc-4.9/libcpp/lex.c b/gcc-4.9/libcpp/lex.c
index a2168e412..6d69b591f 100644
--- a/gcc-4.9/libcpp/lex.c
+++ b/gcc-4.9/libcpp/lex.c
@@ -1648,7 +1648,7 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base,
       if (is_macro (pfile, cur))
 	{
 	  /* Raise a warning, but do not consume subsequent tokens.  */
-	  if (CPP_OPTION (pfile, warn_literal_suffix))
+	  if (CPP_OPTION (pfile, warn_literal_suffix) && !pfile->state.skipping)
 	    cpp_warning_with_line (pfile, CPP_W_LITERAL_SUFFIX,
 				   token->src_loc, 0,
 				   "invalid suffix on literal; C++11 requires "
@@ -1777,7 +1777,7 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
       if (is_macro (pfile, cur))
 	{
 	  /* Raise a warning, but do not consume subsequent tokens.  */
-	  if (CPP_OPTION (pfile, warn_literal_suffix))
+	  if (CPP_OPTION (pfile, warn_literal_suffix) && !pfile->state.skipping)
 	    cpp_warning_with_line (pfile, CPP_W_LITERAL_SUFFIX,
 				   token->src_loc, 0,
 				   "invalid suffix on literal; C++11 requires "
diff --git a/gcc-4.9/libcpp/po/be.gmo b/gcc-4.9/libcpp/po/be.gmo
deleted file mode 100644
index 27f906d6a..000000000
--- a/gcc-4.9/libcpp/po/be.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/ca.gmo b/gcc-4.9/libcpp/po/ca.gmo
deleted file mode 100644
index ecebc8932..000000000
--- a/gcc-4.9/libcpp/po/ca.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/da.gmo b/gcc-4.9/libcpp/po/da.gmo
deleted file mode 100644
index 75648b09e..000000000
--- a/gcc-4.9/libcpp/po/da.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/de.gmo b/gcc-4.9/libcpp/po/de.gmo
deleted file mode 100644
index 89eccfa29..000000000
--- a/gcc-4.9/libcpp/po/de.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/el.gmo b/gcc-4.9/libcpp/po/el.gmo
deleted file mode 100644
index 50d3ecba1..000000000
--- a/gcc-4.9/libcpp/po/el.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/eo.gmo b/gcc-4.9/libcpp/po/eo.gmo
deleted file mode 100644
index aca3846aa..000000000
--- a/gcc-4.9/libcpp/po/eo.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/es.gmo b/gcc-4.9/libcpp/po/es.gmo
deleted file mode 100644
index 0eaa7cbb5..000000000
--- a/gcc-4.9/libcpp/po/es.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/fi.gmo b/gcc-4.9/libcpp/po/fi.gmo
deleted file mode 100644
index 1bcf12700..000000000
--- a/gcc-4.9/libcpp/po/fi.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/fr.gmo b/gcc-4.9/libcpp/po/fr.gmo
deleted file mode 100644
index c6ec5430c..000000000
--- a/gcc-4.9/libcpp/po/fr.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/id.gmo b/gcc-4.9/libcpp/po/id.gmo
deleted file mode 100644
index f5d8f2f6e..000000000
--- a/gcc-4.9/libcpp/po/id.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/ja.gmo b/gcc-4.9/libcpp/po/ja.gmo
deleted file mode 100644
index 6359d10e7..000000000
--- a/gcc-4.9/libcpp/po/ja.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/nl.gmo b/gcc-4.9/libcpp/po/nl.gmo
deleted file mode 100644
index 3539d361a..000000000
--- a/gcc-4.9/libcpp/po/nl.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/pt_BR.gmo b/gcc-4.9/libcpp/po/pt_BR.gmo
deleted file mode 100644
index 32290fd25..000000000
--- a/gcc-4.9/libcpp/po/pt_BR.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/ru.gmo b/gcc-4.9/libcpp/po/ru.gmo
deleted file mode 100644
index bfb410dc6..000000000
--- a/gcc-4.9/libcpp/po/ru.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/sr.gmo b/gcc-4.9/libcpp/po/sr.gmo
deleted file mode 100644
index 836d223e1..000000000
--- a/gcc-4.9/libcpp/po/sr.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/sv.gmo b/gcc-4.9/libcpp/po/sv.gmo
deleted file mode 100644
index 5c0af3092..000000000
--- a/gcc-4.9/libcpp/po/sv.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/tr.gmo b/gcc-4.9/libcpp/po/tr.gmo
deleted file mode 100644
index f4c82279e..000000000
--- a/gcc-4.9/libcpp/po/tr.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/uk.gmo b/gcc-4.9/libcpp/po/uk.gmo
deleted file mode 100644
index 3c6c3c875..000000000
--- a/gcc-4.9/libcpp/po/uk.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/vi.gmo b/gcc-4.9/libcpp/po/vi.gmo
deleted file mode 100644
index f2b49849e..000000000
--- a/gcc-4.9/libcpp/po/vi.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/zh_CN.gmo b/gcc-4.9/libcpp/po/zh_CN.gmo
deleted file mode 100644
index 1ae2d2f07..000000000
--- a/gcc-4.9/libcpp/po/zh_CN.gmo
+++ /dev/null
diff --git a/gcc-4.9/libcpp/po/zh_TW.gmo b/gcc-4.9/libcpp/po/zh_TW.gmo
deleted file mode 100644
index 24d7b11d9..000000000
--- a/gcc-4.9/libcpp/po/zh_TW.gmo
+++ /dev/null