From patchwork Mon Mar 22 11:15:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Paul Adrian Glaubitz X-Patchwork-Id: 42732 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 578013857003; Mon, 22 Mar 2021 11:15:50 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from outpost17.zedat.fu-berlin.de (outpost17.zedat.fu-berlin.de [130.133.4.110]) by sourceware.org (Postfix) with ESMTPS id 85C753858004 for ; Mon, 22 Mar 2021 11:15:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 85C753858004 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=physik.fu-berlin.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=glaubitz@physik.fu-berlin.de Received: from relay1.zedat.fu-berlin.de ([130.133.4.67]) by outpost.zedat.fu-berlin.de (Exim 4.94) with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (envelope-from ) id 1lOIXA-000bfj-GU; Mon, 22 Mar 2021 12:15:44 +0100 Received: from mx.physik.fu-berlin.de ([160.45.64.218]) by relay1.zedat.fu-berlin.de (Exim 4.94) with esmtps (TLS1.2) tls TLS_DHE_RSA_WITH_AES_128_CBC_SHA (envelope-from ) id 1lOIXA-003uu8-EE; Mon, 22 Mar 2021 12:15:44 +0100 Received: from epyc.physik.fu-berlin.de ([160.45.64.180]) by mx.physik.fu-berlin.de with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1lOIX7-0001EQ-60; Mon, 22 Mar 2021 12:15:41 +0100 Received: from glaubitz by epyc.physik.fu-berlin.de with local (Exim 4.94 #2 (Debian)) id 1lOIX6-00DUOP-T4; Mon, 22 Mar 2021 12:15:40 +0100 From: John Paul Adrian Glaubitz To: libc-alpha@sourceware.org Subject: [PATCH] stdio: Move include of bits/stdio-ldbl.h before bits/stdio.h Date: Mon, 22 Mar 2021 12:15:31 +0100 Message-Id: <20210322111530.3215018-1-glaubitz@physik.fu-berlin.de> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-Originating-IP: 160.45.64.218 X-ZEDAT-Hint: RV X-Spam-Status: No, score=-17.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_NONE, SPF_NONE, 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: , Cc: John Paul Adrian Glaubitz Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On targets where long double math is optional and the architecture does not support support long double, glibc defines a number of redirection macros which alias "foo" with "__nldbl_foo" while applying an __asm__ label. As a result, the __asm__ label gets applied after vfprintf() has already been used which is not allowed. Moving bits/stdio-ldbl.h bits/stdio.h in libio/stdio.h avoids this problem. Fixes bug 27558. --- libio/stdio.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libio/stdio.h b/libio/stdio.h index 144137cf67..ae5337e855 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -857,6 +857,11 @@ extern void funlockfile (FILE *__stream) __THROW; extern int __uflow (FILE *); extern int __overflow (FILE *, int); +#include +#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 +# include +#endif + /* If we are compiling with optimizing read this file. It contains several optimizing inline functions and macros. */ #ifdef __USE_EXTERN_INLINES @@ -866,11 +871,6 @@ extern int __overflow (FILE *, int); # include #endif -#include -#if defined __LDBL_COMPAT || __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 -# include -#endif - __END_DECLS #endif /* included. */