From a1f93bf42ae2f26507efcc48f430efb02ca25cca Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 6 Jul 2020 13:56:34 +0100
Subject: [PATCH] Replacwe string length constant with "sizeof()-1" in previous
 delta to target-reloc.h.

---
 gold/target-reloc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gold/target-reloc.h b/gold/target-reloc.h
index d1d0e135894..a8c8e8405b2 100644
--- a/gold/target-reloc.h
+++ b/gold/target-reloc.h
@@ -136,7 +136,8 @@ class Default_comdat_behavior
     if (Layout::is_debug_info_section(name))
       return CB_PRETEND;
     if (strcmp(name, ".eh_frame") == 0
-	|| strncmp(name, ".gnu.build.attributes", 21) == 0
+#define ATTR_SECTION_PREFIX ".gnu.build.attributes"
+	|| strncmp(name, ATTR_SECTION_PREFIX, sizeof (ATTR_SECTION_PREFIX) - 1) == 0
 	|| strcmp(name, ".gcc_except_table") == 0)
       return CB_IGNORE;
     return CB_ERROR;
-- 
2.47.3