Commit: af1198f5fa95a3dc09075fe496b6277b871d1daf - gcc_os216 (git)

GCC with patches for OS216

Commit MetaInfo

• Revision: af1198f5fa95a3dc09075fe496b6277b871d1daf (tree)
• Zeit: 2020-07-02 05:15:28
• Autor: Iain Sandoe <iain@sand...>
• Commiter: Iain Sandoe

Log Message

Merge master r11-1769.

* Merge master r11-1769-g039a630d787dc.

Ändern Zusammenfassung

• modified: gcc/fortran/check.c
• modified: gcc/testsuite/g++.dg/analyzer/pr94028.C

Diff

--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -67,7 +67,7 @@ gfc_invalid_boz (const char *msg, locus *loc)
       return false;
     }
 
-  const char hint[] = _(" [see %<-fno-allow-invalid-boz%>]");
+  const char hint[] = " [see %<-fno-allow-invalid-boz%>]";
   size_t len = strlen (msg) + strlen (hint) + 1;
   char *msg2 = (char *) alloca (len);
   strcpy (msg2, msg);

--- a/gcc/testsuite/g++.dg/analyzer/pr94028.C
+++ b/gcc/testsuite/g++.dg/analyzer/pr94028.C
@@ -12,7 +12,7 @@ enum e {} i;
 
 struct j
 {
-  void *operator new (__SIZE_TYPE__ b)
+  void *operator new (__SIZE_TYPE__ b) throw()
   {
     return calloc (b, sizeof (int)); // { dg-warning "leak" }
   }