From: Georg-Johann Lay <avr@gjlay.de>
Date: Fri, 22 Mar 2024 16:29:21 +0000 (+0100)
Subject: AVR: Adjust message for SIGNAL and INTERRUPT usage
X-Git-Tag: basepoints/gcc-15~509
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b7d1862e11784a0ce67ab758e06dd8aa65b181;p=thirdparty%2Fgcc.git

AVR: Adjust message for SIGNAL and INTERRUPT usage

gcc/
	* config/avr/avr.cc (avr_set_current_function): Adjust diagnostic
	for deprecated SIGNAL and INTERRUPT usage without respective header.
---

diff --git a/gcc/config/avr/avr.cc b/gcc/config/avr/avr.cc
index 12c59668b4c8..4a5a921107bb 100644
--- a/gcc/config/avr/avr.cc
+++ b/gcc/config/avr/avr.cc
@@ -1495,14 +1495,20 @@ avr_set_current_function (tree decl)
   // Common problem is using "ISR" without first including avr/interrupt.h.
   const char *name = IDENTIFIER_POINTER (DECL_NAME (decl));
   name = default_strip_name_encoding (name);
-  if (strcmp ("ISR", name) == 0
-      || strcmp ("INTERRUPT", name) == 0
-      || strcmp ("SIGNAL", name) == 0)
+  if (strcmp ("ISR", name) == 0)
     {
       warning_at (loc, OPT_Wmisspelled_isr, "%qs is a reserved identifier"
 		  " in AVR-LibC.  Consider %<#include <avr/interrupt.h>%>"
 		  " before using the %qs macro", name, name);
     }
+  if (strcmp ("INTERRUPT", name) == 0
+      || strcmp ("SIGNAL", name) == 0)
+    {
+      warning_at (loc, OPT_Wmisspelled_isr, "%qs is a deprecated identifier"
+		  " in AVR-LibC.  Consider %<#include <avr/interrupt.h>%>"
+		  " or %<#include <compat/deprecated.h>%>"
+		  " before using the %qs macro", name, name);
+    }
 #endif // AVR-LibC naming conventions
 
   /* Don't print the above diagnostics more than once.  */