libcpp/

2013-11-06 Tobias Burnus <burnus@net-b.de> * macro.c (_cpp_builtin_macro_text): Correct wording of two warnings. gcc/c-family/ 2013-11-06 Tobias Burnus <burnus@net-b.de> * c-common.c (reason_option_codes_t): Add CPP_W_DATE_TIME. gcc/ 2013-11-06 Tobias Burnus <burnus@net-b.de> * doc/invoke.texi (Wdate-time): Fix typo. gcc/testsuite/ 2013-11-06 Tobias Burnus <burnus@net-b.de> * g++.dg/warn/wdate-time.C: Update dg-error pattern. * gcc.dg/wdate-time.c: Ditto. * gfortran.dg/wdate-time.F90: Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204486 138bc75d-0d04-0410-961f-82ee72b054a4
caishuangmin · Nov 6, 2013 · 5b1a062 · 5b1a062
1 parent 6f595bd
commit 5b1a062
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 14 deletions.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Tobias Burnus  <burnus@net-b.de>
+
+	* doc/invoke.texi (Wdate-time): Fix typo.
+
 2013-11-06  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	* config/sh/sh.md (addsf3, divsf3, divsf3_i, rsqrtsf2, cmpgtdf_t,

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Tobias Burnus  <burnus@net-b.de>
+
+	* c-common.c (reason_option_codes_t): Add CPP_W_DATE_TIME.
+
 2013-11-06  Joseph Myers  <joseph@codesourcery.com>
 
 	* c-opts.c (c_common_post_options): Set -ffp-contract=off in C

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
@@ -9565,6 +9565,7 @@ static const struct reason_option_codes_t option_codes[] = {
   {CPP_W_INVALID_PCH,			OPT_Winvalid_pch},
   {CPP_W_WARNING_DIRECTIVE,		OPT_Wcpp},
   {CPP_W_LITERAL_SUFFIX,		OPT_Wliteral_suffix},
+  {CPP_W_DATE_TIME,			OPT_Wdate_time},
   {CPP_W_NONE,				0}
 };
 

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
@@ -4530,7 +4530,7 @@ be useful to facilitate the conversion to @code{nullptr} in C++11.
 @opindex Wdate-time
 @opindex Wno-date-time
 Warn when macros @code{__TIME__}, @code{__DATE__} or @code{__TIMESTAMP__}
-are encountered as they might prevent bit-wise-identical reproducable
+are encountered as they might prevent bit-wise-identical reproducible
 compilations.
 
 @item -Wdelete-incomplete @r{(C++ and Objective-C++ only)}

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-06  Tobias Burnus  <burnus@net-b.de>
+
+	* g++.dg/warn/wdate-time.C: Update dg-error pattern.
+	* gcc.dg/wdate-time.c: Ditto.
+	* gfortran.dg/wdate-time.F90: Ditto.
+
 2013-11-06  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/30807

diff --git a/gcc/testsuite/g++.dg/warn/wdate-time.C b/gcc/testsuite/g++.dg/warn/wdate-time.C
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-Wdate-time" } */
 
-const char time[] = __TIME__;  /* { dg-warning "might prevent reproduce builds" }  */
-const char date[] = __DATE__;  /* { dg-warning "might prevent reproduce builds" }  */
-const char timestamp[] = __TIMESTAMP__;  /* { dg-warning "might prevent reproduce builds" }  */
+const char time[] = __TIME__;  /* { dg-warning "might prevent reproducible builds" }  */
+const char date[] = __DATE__;  /* { dg-warning "might prevent reproducible builds" }  */
+const char timestamp[] = __TIMESTAMP__;  /* { dg-warning "might prevent reproducible builds" }  */
diff --git a/gcc/testsuite/gcc.dg/wdate-time.c b/gcc/testsuite/gcc.dg/wdate-time.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-Wdate-time" } */
 
-const char time[] = __TIME__;  /* { dg-warning "might prevent reproduce builds" }  */
-const char date[] = __DATE__;  /* { dg-warning "might prevent reproduce builds" }  */
-const char timestamp[] = __TIMESTAMP__;  /* { dg-warning "might prevent reproduce builds" }  */
+const char time[] = __TIME__;  /* { dg-warning "might prevent reproducible builds" }  */
+const char date[] = __DATE__;  /* { dg-warning "might prevent reproducible builds" }  */
+const char timestamp[] = __TIMESTAMP__;  /* { dg-warning "might prevent reproducible builds" }  */
diff --git a/gcc/testsuite/gfortran.dg/wdate-time.F90 b/gcc/testsuite/gfortran.dg/wdate-time.F90
@@ -1,6 +1,6 @@
 ! { dg-do compile }
 ! { dg-options "-Wdate-time" }
-print *, __TIMESTAMP__  ! { dg-warning "might prevent reproduce builds" }
-print *, __TIME__  ! { dg-warning "might prevent reproduce builds" }
-print *, __DATE__  ! { dg-warning "might prevent reproduce builds" }
+print *, __TIMESTAMP__  ! { dg-warning "might prevent reproducible builds" }
+print *, __TIME__  ! { dg-warning "might prevent reproducible builds" }
+print *, __DATE__  ! { dg-warning "might prevent reproducible builds" }
 end
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-06  Tobias Burnus  <burnus@net-b.de>
+
+	* macro.c (_cpp_builtin_macro_text): Correct
+	wording of two warnings.
+
 2013-11-05  Tobias Burnus  <burnus@net-b.de>
 
 	* include/cpplib.h (CPP_W_DATE_TIME): Added.

diff --git a/libcpp/macro.c b/libcpp/macro.c
@@ -233,8 +233,8 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node)
     case BT_TIMESTAMP:
       {
 	if (CPP_OPTION (pfile, warn_date_time))
-	  cpp_warning (pfile, CPP_W_DATE_TIME, "Macro \"%s\" might prevent "
-		       "reproduce builds", NODE_NAME (node));
+	  cpp_warning (pfile, CPP_W_DATE_TIME, "macro \"%s\" might prevent "
+		       "reproducible builds", NODE_NAME (node));
 
 	cpp_buffer *pbuffer = cpp_get_buffer (pfile);
 	if (pbuffer->timestamp == NULL)
@@ -330,8 +330,8 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node)
     case BT_DATE:
     case BT_TIME:
       if (CPP_OPTION (pfile, warn_date_time))
-	cpp_warning (pfile, CPP_W_DATE_TIME, "Macro \"%s\" might prevent "
-		     "reproduce builds", NODE_NAME (node));
+	cpp_warning (pfile, CPP_W_DATE_TIME, "macro \"%s\" might prevent "
+		     "reproducible builds", NODE_NAME (node));
       if (pfile->date == NULL)
 	{
 	  /* Allocate __DATE__ and __TIME__ strings from permanent