From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 15 Nov 2024 11:00:47 +0000 (+0100)
Subject: Report the section name in case of section type conflicts
X-Git-Tag: basepoints/gcc-16~4240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71bf2bef5e99aad810eb65847d878360a0042a02;p=thirdparty%2Fgcc.git

Report the section name in case of section type conflicts

The section name might the user a hint of what is going on.

gcc/

	* varasm.cc (get_section): Include name of section in
	diagnostic messages.
---

diff --git a/gcc/varasm.cc b/gcc/varasm.cc
index 0712b4860294..acc4b4a04194 100644
--- a/gcc/varasm.cc
+++ b/gcc/varasm.cc
@@ -355,17 +355,20 @@ get_section (const char *name, unsigned int flags, tree decl,
 	      && decl != sect->named.decl)
 	    {
 	      if (decl != NULL && DECL_P (decl))
-		error ("%+qD causes a section type conflict with %qD",
-		       decl, sect->named.decl);
+		error ("%+qD causes a section type conflict with %qD"
+		       " in section %qs",
+		       decl, sect->named.decl, name);
 	      else
-		error ("section type conflict with %qD", sect->named.decl);
+		error ("section type conflict with %qD in section %qs",
+		       sect->named.decl, name);
 	      inform (DECL_SOURCE_LOCATION (sect->named.decl),
 		      "%qD was declared here", sect->named.decl);
 	    }
 	  else if (decl != NULL && DECL_P (decl))
-	    error ("%+qD causes a section type conflict", decl);
+	    error ("%+qD causes a section type conflict for section %qs",
+		   decl, name);
 	  else
-	    error ("section type conflict");
+	    error ("section type conflict for section %qs", name);
 	  /* Make sure we don't error about one section multiple times.  */
 	  sect->common.flags |= SECTION_OVERRIDE;
 	}