From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
 id 21E0E38344DC; Thu,  9 Jun 2022 13:15:30 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21E0E38344DC
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/azanella/clang] elf: Suppress warning on clang
X-Act-Checkin: glibc
X-Git-Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
X-Git-Refname: refs/heads/azanella/clang
X-Git-Oldrev: 48812a7a8947bc2dded840be02948a5ae023058d
X-Git-Newrev: 3482fc988209bb578caad90822570f29c5b50867
Message-Id: <20220609131530.21E0E38344DC@sourceware.org>
Date: Thu,  9 Jun 2022 13:15:30 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2022 13:15:30 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3482fc988209bb578caad90822570f29c5b50867

commit 3482fc988209bb578caad90822570f29c5b50867
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Thu Mar 10 09:48:32 2022 -0300

    elf: Suppress warning on clang

Diff:
---
 elf/rtld.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/elf/rtld.c b/elf/rtld.c
index b8c7f1c166..0dea6621ce 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2532,10 +2532,16 @@ warning: debug option `%s' unknown; try LD_DEBUG=help\n", copy);
       _dl_printf ("\
 Valid options for the LD_DEBUG environment variable are:\n\n");
 
+      /* clang issues an warning adding 'const unsigned char' to a string
+	 does not append to the string, however it is exactly what code
+	 means here.  */
+      DIAG_PUSH_NEEDS_COMMENT_CLANG;
+      DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int");
       for (cnt = 0; cnt < ndebopts; ++cnt)
 	_dl_printf ("  %.*s%s%s\n", debopts[cnt].len, debopts[cnt].name,
 		    "         " + debopts[cnt].len - 3,
 		    debopts[cnt].helptext);
+      DIAG_POP_NEEDS_COMMENT_CLANG;
 
       _dl_printf ("\n\
 To direct the debugging output into a file instead of standard output\n\