From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 3A94A3858423; Thu, 9 Feb 2023 19:47:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A94A3858423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675972048; bh=OzSJ6juA2WBLLAaGg6vlrhRiQkEzN90vft/CjpDqPBs=; h=From:To:Subject:Date:From; b=LEgQSDNNFyzmuctuGZgRR+tnE9txN5TKib5BZl+indMDOsOAUSyd1pnRXgY0FYVjb 1+5HE4TykmV3FUqoKs8UswZCQZ33OWA7Ku2TlTkr5SLk7W98MpTH7KHCzvB4wD3iXm JxA4Yk/x3BYeo/vT+v4tFQQbM7N2DOrCGl30BzW4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] iconvdata: Suppress clang warning on locale definitions X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 53a36442b3403d35250775599fcba07a761298e4 X-Git-Newrev: 8ca0b2b709e64f1f519fd526c7c95108b8d6873a Message-Id: <20230209194728.3A94A3858423@sourceware.org> Date: Thu, 9 Feb 2023 19:47:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8ca0b2b709e64f1f519fd526c7c95108b8d6873a commit 8ca0b2b709e64f1f519fd526c7c95108b8d6873a Author: Adhemerval Zanella Date: Thu Mar 10 10:01:09 2022 -0300 iconvdata: Suppress clang warning on locale definitions Diff: --- iconvdata/gbk.c | 5 +++++ iconvdata/iso-2022-cn-ext.c | 16 +++++----------- iconvdata/iso-2022-cn.c | 5 +++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index 6a0ba3388a..40d582f5fb 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -13212,6 +13212,10 @@ static const char __gbk_from_ucs4_tab12[][2] = } #include +/* clang issues an warning adding 'unsigned int' 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"); /* Next, define the other direction. */ #define MIN_NEEDED_INPUT MIN_NEEDED_TO @@ -13493,6 +13497,7 @@ static const char __gbk_from_ucs4_tab12[][2] = #define LOOP_NEED_FLAGS #include +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index d0c3ca4f03..10fcecebba 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -387,6 +387,10 @@ enum #define LOOP_NEED_FLAGS #include +/* clang issues an warning adding 'int' 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"); /* Next, define the other direction. */ #define MIN_NEEDED_INPUT TO_LOOP_MIN_NEEDED_FROM @@ -394,16 +398,6 @@ enum #define MIN_NEEDED_OUTPUT TO_LOOP_MIN_NEEDED_TO #define MAX_NEEDED_OUTPUT TO_LOOP_MAX_NEEDED_TO #define LOOPFCT TO_LOOP -/* With GCC 5.3 when compiling with -Os the compiler emits a warning - that buf[0] and buf[1] may be used uninitialized. This can only - happen in the case where tmpbuf[3] is used, and in that case the - write to the tmpbuf[1] and tmpbuf[2] was assured because - ucs4_to_cns11643 would have filled in those entries. The difficulty - is in getting the compiler to see this logic because tmpbuf[0] is - involved in determining the code page and is the indicator that - tmpbuf[2] is initialized. */ -DIAG_PUSH_NEEDS_COMMENT; -DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); #define BODY \ { \ uint32_t ch; \ @@ -655,7 +649,6 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); /* Now that we wrote the output increment the input pointer. */ \ inptr += 4; \ } -DIAG_POP_NEEDS_COMMENT; #define EXTRA_LOOP_DECLS , int *setp #define INIT_PARAMS int set = (*setp >> 3) & CURRENT_MASK; \ int ann = (*setp >> 3) & ~CURRENT_MASK @@ -669,6 +662,7 @@ DIAG_POP_NEEDS_COMMENT; #define LOOP_NEED_FLAGS #include +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index 73eb5e77c6..828d4dbab5 100644 --- a/iconvdata/iso-2022-cn.c +++ b/iconvdata/iso-2022-cn.c @@ -227,6 +227,10 @@ enum #define UPDATE_PARAMS *setp = set | ann #include +/* clang issues an warning adding 'int' 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"); /* Next, define the other direction. */ #define MIN_NEEDED_INPUT TO_LOOP_MIN_NEEDED_FROM @@ -401,6 +405,7 @@ enum #define UPDATE_PARAMS *setp = set | ann #include +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include