From: Adhemerval Zanella Netto Date: Tue, 25 Jul 2023 15:16:40 +0000 (-0300) Subject: linux: Fix i686 with gcc6 X-Git-Tag: glibc-2.38~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbc4b032dc5c4ef0c46e9de23c46b1698bad4412;p=thirdparty%2Fglibc.git linux: Fix i686 with gcc6 On __convert_scm_timestamps GCC 6 issues an warning that tvts[0]/tvts[1] maybe be used uninitialized, however it would be used if type is set to a value different than 0 (done by either COMPAT_SO_TIMESTAMP_OLD or COMPAT_SO_TIMESTAMPNS_OLD) which will fallthrough to 'common' label. It does not show with gcc 7 or more recent versions. Checked on i686-linux-gnu. Reviewed-by: Carlos O'Donell --- diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c index 42f9613416f..06c8adeee10 100644 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c @@ -23,6 +23,7 @@ # include # include # include +# include /* It converts the first SO_TIMESTAMP or SO_TIMESTAMPNS with 32-bit time and appends it to the control buffer. The 32-bit time field is kept as-is. @@ -44,7 +45,15 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) 'struct __kernel_sock_timeval' while for SO_TIMESTAMPNS_NEW is a 'struct __kernel_timespec'. In either case it is two uint64_t members. */ + + /* GCC 6 issues an warning that tvts[0]/tvts[1] maybe be used uninitialized, + however it would be used if type is set to a value different than 0 + (done by either COMPAT_SO_TIMESTAMP_OLD or COMPAT_SO_TIMESTAMPNS_OLD) + which will fallthrough to 'common' label. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_NEEDS_COMMENT (6, "-Wmaybe-uninitialized"); int64_t tvts[2]; + DIAG_POP_NEEDS_COMMENT; int32_t tmp[2]; struct cmsghdr *cmsg, *last = NULL;