From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7814) id 694AF3890402; Fri, 29 Jan 2021 18:26:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 694AF3890402 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Fangrui Song To: glibc-cvs@sourceware.org Subject: [glibc/maskray/lld] posix: Fix fnmatch.c on bootstrap X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/maskray/lld X-Git-Oldrev: 961d7cff51332b7b4ed98d4530a98f73355dda4b X-Git-Newrev: d7ee6bd8c217a4deb756739039fa9c165d26ec43 Message-Id: <20210129182638.694AF3890402@sourceware.org> Date: Fri, 29 Jan 2021 18:26:38 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2021 18:26:38 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d7ee6bd8c217a4deb756739039fa9c165d26ec43 commit d7ee6bd8c217a4deb756739039fa9c165d26ec43 Author: Adhemerval Zanella Date: Wed Jan 20 16:07:59 2021 +0000 posix: Fix fnmatch.c on bootstrap Only define FALLTHROUGH for _LIBC and do not check __clang_major__ value. It partially syncs with gnulib 5c52f00c69f39fe. Checked with build-many-glibcs.py for aarch64-linux-gnu. Diff: --- posix/fnmatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/posix/fnmatch.c b/posix/fnmatch.c index 5896812c96..b8a71f164d 100644 --- a/posix/fnmatch.c +++ b/posix/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)