diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | lib/fnmatch.c | 2 | ||||
| -rw-r--r-- | lib/fts.c | 4 | ||||
| -rw-r--r-- | lib/regex_internal.h | 6 | ||||
| -rw-r--r-- | modules/regex | 1 |
5 files changed, 23 insertions, 5 deletions
@@ -1,3 +1,18 @@ +2021-01-19 Paul Eggert <eggert@cs.ucla.edu> + + fnmatch, regex, fts: FALLTHROUGH consistency + Be more consistent about how FALLTHROUGH is defined. + For Gnulib, use attribute.h. For glibc, use __GNUC__ >= 7. + Problem for glibc reported by Vaseeharan Vinayagamoorthy in: + https://sourceware.org/pipermail/libc-alpha/2021-January/121778.html + * lib/fnmatch.c (FALLTHROUGH) [_LIBC]: + * lib/regex_internal.h (FALLTHROUGH) [_LIBC]: + Don’t worry about Clang, as it’s not needed and provokes GCC. + * lib/fts.c (FALLTHROUGH) [!_LIBC]: + * lib/regex_internal.h (FALLTHROUGH) [!_LIBC]: + Rely on attribute.h for FALLTHROUGH + * modules/regex: Depend on attribute module. + 2021-01-19 KO Myung-Hun <komh78@gmail.com> spawn-pipe: Fix SIGSEGV on OS/2 kLIBC. diff --git a/lib/fnmatch.c b/lib/fnmatch.c index 5896812c96..b8a71f164d 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -64,7 +64,7 @@ extern int fnmatch (const char *pattern, const char *string, int flags); #endif #ifdef _LIBC -# if (__GNUC__ >= 7) || (__clang_major__ >= 10) +# if __GNUC__ >= 7 # define FALLTHROUGH __attribute__ ((__fallthrough__)) # else # define FALLTHROUGH ((void) 0) @@ -200,8 +200,8 @@ enum Fts_stat while (false) #endif -#ifndef FALLTHROUGH -# if (__GNUC__ >= 7) || (__clang_major__ >= 10) +#ifdef _LIBC +# if __GNUC__ >= 7 # define FALLTHROUGH __attribute__ ((__fallthrough__)) # else # define FALLTHROUGH ((void) 0) diff --git a/lib/regex_internal.h b/lib/regex_internal.h index b4f91d9ec7..3fa2bf1aa5 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -830,12 +830,14 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx) } #endif /* RE_ENABLE_I18N */ -#ifndef FALLTHROUGH -# if (__GNUC__ >= 7) || (__clang_major__ >= 10) +#ifdef _LIBC +# if __GNUC__ >= 7 # define FALLTHROUGH __attribute__ ((__fallthrough__)) # else # define FALLTHROUGH ((void) 0) # endif +#else +# include "attribute.h" #endif #endif /* _REGEX_INTERNAL_H */ diff --git a/modules/regex b/modules/regex index 20cbe375ad..a32c46e183 100644 --- a/modules/regex +++ b/modules/regex @@ -16,6 +16,7 @@ Depends-on: c99 extensions ssize_t +attribute [test $ac_use_included_regex = yes] btowc [test $ac_use_included_regex = yes] builtin-expect [test $ac_use_included_regex = yes] dynarray [test $ac_use_included_regex = yes] |