From patchwork Wed Jan 20 13:02:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 41766 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E9CA395CC56; Wed, 20 Jan 2021 13:02:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E9CA395CC56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1611147762; bh=g2wU17SYAcLMzjEYegdArtaczkmQm2+rYScha7ZQ8ng=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vcvmbPA5DkkGetB7iAUyhqCmd5ME9dXhWY9451zPdj/GZJt87RK+nhIS2C+MvsCg8 y+R+Un33d86g1uLaMkuIsgiGqw5VzSnekpjagVmmO+YeXb+rvrsOFq5XZVwKNOtcbB EYEZ93Qe3Hm4tqo+aQ8vdigABWQvxrDJmLwNSPBs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by sourceware.org (Postfix) with ESMTPS id 3F164395C01C for ; Wed, 20 Jan 2021 13:02:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3F164395C01C Received: by mail-qk1-x730.google.com with SMTP id v126so25121282qkd.11 for ; Wed, 20 Jan 2021 05:02:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=g2wU17SYAcLMzjEYegdArtaczkmQm2+rYScha7ZQ8ng=; b=RDKBm3gfBe7BDrBksu5I8civo6AYDSKs4ll5xUQ/9cPliPeIpyOk2Wutbq+IA31sLD t2tlnTsAAdTkNiITxCyx0Iji6pOsokEeQlMpgRTYEqYlrz1CNDVnn68iVND9iNHTXVdH 3VnFV7JubdhAdoqQc3CQyuDYE+oyogWEXAh+ResH3G+g+/yTk8bzZveNfCOdbFh5qUay YL1AFD8d8s62uyTEuYTiTMTZvTgzjQve7jdhAdvMonMAd94zQkD047vIcJSeUMMZB0mS v3+S/8dxAKSbgCYTShLLBvQCF5KryL/JT5oYSm01AcUmlfFigpa50tI6jbsuf69e19sD EQfQ== X-Gm-Message-State: AOAM533khJuwunNwzmZdStgdA3+AYf1HILhrsF0N+P/AQVGl/0dFlUls DYGMiacLlRAiJhC3WNPSpYUd6mpwE/7Lug== X-Google-Smtp-Source: ABdhPJwullriMO3u+o0j1lnNBYeTH2O1Dtk+ZJFStZ/9PtZi2D6cYfLl2rgQ+4bdbLE8HTeRT/aEFQ== X-Received: by 2002:a37:9b42:: with SMTP id d63mr9309183qke.449.1611147759484; Wed, 20 Jan 2021 05:02:39 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v47sm1077493qtb.42.2021.01.20.05.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 05:02:38 -0800 (PST) To: libc-alpha@sourceware.org, Vaseeharan Vinayagamoorthy , Paul Eggert , Bruno Haible Subject: [COMMITTED] posix: Fix regex_internal.h on bootstrap Date: Wed, 20 Jan 2021 10:02:34 -0300 Message-Id: <20210120130234.1040284-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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, x86_64-linux-gnu, and s390x-linux-gnu. --- posix/regex_internal.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/posix/regex_internal.h b/posix/regex_internal.h index e31ac92674..011f733176 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -848,12 +848,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 */