From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by sourceware.org (Postfix) with ESMTPS id EE0453948806 for ; Thu, 12 May 2022 20:03:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE0453948806 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-d39f741ba0so7959580fac.13 for ; Thu, 12 May 2022 13:03:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=e5J2662F4Wr1q1iupfWwEraGs4rmlkLs7HH3NK+Rq4I=; b=LT71sUoA11Say9fpd4/lanMhIlyUBzUCO1L8GuldM4r4B3BC5hsmkYAW7tVIjL6o7t G+lF/FbMf7xAuWrn83LT0dC7YuiGHrGjbvGm2dh/W98gDz67iE+CsW+vx9XsLFO1haOs 7U/pM9nP78kr9IrXANQDC5R8/tKjC5kfKEo346M8oHuW5E88v3yL0zrB6f/IgyjiJNk+ XbYX4nukQFJN+81aNTpWrRnlwpirxEF+TxZy02HhsC4QPwCg8buHNJ29OGDGQHqlox/K kFySpdCqfbiqDMVm8f7g06qOmJmJ3/Y7CTKuMA3i2q3mMlbbaj0aqE84jTFgfW9uscyR 5FJg== X-Gm-Message-State: AOAM531dKTj7itBMpgdPrtVMsje1idbYykRCpW6v75ZeryQT6jkCLLH0 a4WSoWppxrww/bbatPY6tPH3LWt1H9Wwuw== X-Google-Smtp-Source: ABdhPJyxrCbCtwLuFAXSJnmxks66F80UmWULo/mDmHIJtofBEMS0Pi0mb318o/tNBQ8uYWmpi6Dchg== X-Received: by 2002:a05:6870:2053:b0:ec:d66d:d9d0 with SMTP id l19-20020a056870205300b000ecd66dd9d0mr820506oad.196.1652385806697; Thu, 12 May 2022 13:03:26 -0700 (PDT) Received: from ?IPV6:2804:431:c7ca:5fbd:6a01:8849:5cb:128b? ([2804:431:c7ca:5fbd:6a01:8849:5cb:128b]) by smtp.gmail.com with ESMTPSA id t129-20020aca5f87000000b00328a1be5c3asm302290oib.25.2022.05.12.13.03.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 May 2022 13:03:25 -0700 (PDT) Message-ID: Date: Thu, 12 May 2022 17:03:23 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v2 2/4] stdio: Remove the usage of $(fno-unit-at-a-time) for errlist.c Content-Language: en-US To: Fangrui Song Cc: libc-alpha@sourceware.org References: <20220512125931.523712-1-adhemerval.zanella@linaro.org> <20220512125931.523712-3-adhemerval.zanella@linaro.org> <20220512170321.mnjpbwlurqkuxkrl@google.com> From: Adhemerval Zanella In-Reply-To: <20220512170321.mnjpbwlurqkuxkrl@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-List-Received-Date: Thu, 12 May 2022 20:03:31 -0000 On 12/05/2022 14:03, Fangrui Song wrote: > On 2022-05-12, Adhemerval Zanella wrote: >> The errlist.c is build with -fno-toplevel-reorder to avoid compiler to >> reorder the compat assembly directives due a static linker issue [1] >> (fixed on 2.39). > > From https://sourceware.org/pipermail/libc-alpha/2022-May/138657.html > > s/build/built > s/static linker/assembler/ Oops, I though I had these fixed. > > Otherwise looks good. > > Reviewed-by: Fangrui Song Thanks. > >> This patch removes the compiler flags by split the compat symbol >> generation in two phases.  First the _sys_errlist_internal internal >> without any compat symbol directive is preprocessed to generate an >> assembly source code.  This generate assembly is then used as input >> on a platform agnostic errlist-data.S which then creates the compat >> definitions.  This prevents compiler to move any compat directive >> prior the _sys_errlist_internal definition itself. >> >> Checked on a make check run-built-tests=no on all affected ABIs. >> >> [1] https://sourceware.org/bugzilla/show_bug.cgi?id=29012 >> --- >> Makeconfig                                    |  3 +- >> include/stdio.h                               |  1 + >> stdio-common/Makefile                         | 20 ++++++++++- >> stdio-common/err_map.h                        | 24 +++++++++++++ >> stdio-common/errlist-compat-data.h            |  1 + >> stdio-common/errlist-compat.c                 |  1 - >> stdio-common/errlist-data-gen.c               | 34 +++++++++++++++++++ >> stdio-common/errlist-data.S                   |  7 ++++ >> stdio-common/errlist.c                        | 20 +++-------- >> sysdeps/mach/hurd/{errlist.c => err_map.h}    |  9 +++-- >> ...errlist-compat.c => errlist-compat-data.h} |  0 >> ...errlist-compat.c => errlist-compat-data.h} |  0 >> sysdeps/unix/sysv/linux/errlist-compat.h      | 33 +++++++++++------- >> ...errlist-compat.c => errlist-compat-data.h} |  0 >> ...errlist-compat.c => errlist-compat-data.h} |  0 >> ...errlist-compat.c => errlist-compat-data.h} |  0 >> 16 files changed, 120 insertions(+), 33 deletions(-) >> create mode 100644 stdio-common/err_map.h >> create mode 100644 stdio-common/errlist-compat-data.h >> delete mode 100644 stdio-common/errlist-compat.c >> create mode 100644 stdio-common/errlist-data-gen.c >> create mode 100644 stdio-common/errlist-data.S >> rename sysdeps/mach/hurd/{errlist.c => err_map.h} (83%) >> rename sysdeps/unix/sysv/linux/alpha/{errlist-compat.c => errlist-compat-data.h} (100%) >> rename sysdeps/unix/sysv/linux/{errlist-compat.c => errlist-compat-data.h} (100%) >> rename sysdeps/unix/sysv/linux/hppa/{errlist-compat.c => errlist-compat-data.h} (100%) >> rename sysdeps/unix/sysv/linux/mips/{errlist-compat.c => errlist-compat-data.h} (100%) >> rename sysdeps/unix/sysv/linux/sparc/{errlist-compat.c => errlist-compat-data.h} (100%) >> >> diff --git a/Makeconfig b/Makeconfig >> index 760f14e92f..b5aa07c4f4 100644 >> --- a/Makeconfig >> +++ b/Makeconfig >> @@ -1030,7 +1030,8 @@ ifeq (yes,$(build-shared)) >> # Under --enable-shared, we will build a shared library of PIC objects. >> # The PIC object files are named foo.os. >> object-suffixes += .os >> -CPPFLAGS-.os = -DPIC -DSHARED >> +pic-cppflags = -DPIC -DSHARED >> +CPPFLAGS-.os = $(pic-cppflags) >> CFLAGS-.os = $(filter %frame-pointer,$(+cflags)) $(pic-ccflag) >> libtype.os := lib%_pic.a >> # This can be changed by a sysdep makefile >> diff --git a/include/stdio.h b/include/stdio.h >> index 23b7fd288c..a6f7fd43cb 100644 >> --- a/include/stdio.h >> +++ b/include/stdio.h >> @@ -180,6 +180,7 @@ int __vfxprintf (FILE *__fp, const char *__fmt, __gnuc_va_list, >>   attribute_hidden; >> >> extern const char *const _sys_errlist_internal[] attribute_hidden; >> +extern const size_t _sys_errlist_internal_len attribute_hidden; >> extern const char *__get_errlist (int) attribute_hidden; >> extern const char *__get_errname (int) attribute_hidden; >> >> diff --git a/stdio-common/Makefile b/stdio-common/Makefile >> index a1603e82fe..08bc998436 100644 >> --- a/stdio-common/Makefile >> +++ b/stdio-common/Makefile >> @@ -88,6 +88,7 @@ routines := \ >> >> aux := \ >>   errlist \ >> +  errlist-data \ >>   errname \ >>   fxprintf \ >>   printf-parsemb \ >> @@ -211,6 +212,10 @@ tests := \ >>   xbug \ >>   # tests >> >> +generated += \ >> +  errlist-data-aux-shared.S \ >> +  errlist-data-aux.S \ >> +  # generated >> >> test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble >> >> @@ -246,6 +251,20 @@ tests-special += $(objpfx)tst-errno-manual.out >> >> include ../Rules >> >> +# The errlist.c is built in two phases because compiler might reorder the >> +# compat_symbol directive prior the object itself and on binutils older >> +# than 2.29 it might generate object sizes different than the expected ones. >> +$(objpfx)errlist-data-aux-shared.S: errlist-data-gen.c >> +    $(make-target-directory) >> +    $(compile-command.c) $(pic-cppflags) $(pic-ccflag) $(no-stack-protector) -S >> + >> +$(objpfx)errlist-data-aux.S: errlist-data-gen.c >> +    $(make-target-directory) >> +    $(compile-command.c) $(pie-default) $(no-stack-protector) -S > > Thanks for fixing the extension name (o->S) in v2. > >> +$(objpfx)errlist-data.os: $(objpfx)errlist-data-aux-shared.S >> +$(objpfx)errlist-data.o: $(objpfx)errlist-data-aux.S >> + >> ifeq ($(run-built-tests),yes) >> LOCALES := \ >>   de_DE.ISO-8859-1 \ >> @@ -334,7 +353,6 @@ CFLAGS-isoc99_vfscanf.c += -fexceptions >> CFLAGS-isoc99_vscanf.c += -fexceptions >> CFLAGS-isoc99_fscanf.c += -fexceptions >> CFLAGS-isoc99_scanf.c += -fexceptions >> -CFLAGS-errlist.c += $(fno-unit-at-a-time) >> CFLAGS-siglist.c += $(fno-unit-at-a-time) >> >> # scanf14a.c and scanf16a.c test a deprecated extension which is no >> diff --git a/stdio-common/err_map.h b/stdio-common/err_map.h >> new file mode 100644 >> index 0000000000..6cc3aa3375 >> --- /dev/null >> +++ b/stdio-common/err_map.h >> @@ -0,0 +1,24 @@ >> +/* Internal errno names mapping definition. >> +   Copyright (C) 2022 Free Software Foundation, Inc. >> +   This file is part of the GNU C Library. >> + >> +   The GNU C Library is free software; you can redistribute it and/or >> +   modify it under the terms of the GNU Lesser General Public >> +   License as published by the Free Software Foundation; either >> +   version 2.1 of the License, or (at your option) any later version. >> + >> +   The GNU C Library is distributed in the hope that it will be useful, >> +   but WITHOUT ANY WARRANTY; without even the implied warranty of >> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU >> +   Lesser General Public License for more details. >> + >> +   You should have received a copy of the GNU Lesser General Public >> +   License along with the GNU C Library; if not, see >> +   .  */ >> + >> +#ifndef _ERR_MAP_H >> +#define _ERR_MAP_H >> + >> +#define ERR_MAP(n) (n) >> + >> +#endif >> diff --git a/stdio-common/errlist-compat-data.h b/stdio-common/errlist-compat-data.h >> new file mode 100644 >> index 0000000000..7c89c9a5a4 >> --- /dev/null >> +++ b/stdio-common/errlist-compat-data.h >> @@ -0,0 +1 @@ >> +/* Empty  */ >> diff --git a/stdio-common/errlist-compat.c b/stdio-common/errlist-compat.c >> deleted file mode 100644 >> index 6e25b021ab..0000000000 >> --- a/stdio-common/errlist-compat.c >> +++ /dev/null >> @@ -1 +0,0 @@ >> -/* Empty.  */ >> diff --git a/stdio-common/errlist-data-gen.c b/stdio-common/errlist-data-gen.c >> new file mode 100644 >> index 0000000000..db4f50e6db >> --- /dev/null >> +++ b/stdio-common/errlist-data-gen.c >> @@ -0,0 +1,34 @@ >> +/* Internal errno names mapping definition. >> +   Copyright (C) 2022 Free Software Foundation, Inc. >> +   This file is part of the GNU C Library. >> + >> +   The GNU C Library is free software; you can redistribute it and/or >> +   modify it under the terms of the GNU Lesser General Public >> +   License as published by the Free Software Foundation; either >> +   version 2.1 of the License, or (at your option) any later version. >> + >> +   The GNU C Library is distributed in the hope that it will be useful, >> +   but WITHOUT ANY WARRANTY; without even the implied warranty of >> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU >> +   Lesser General Public License for more details. >> + >> +   You should have received a copy of the GNU Lesser General Public >> +   License along with the GNU C Library; if not, see >> +   .  */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +const char *const _sys_errlist_internal[] = >> +  { >> +#define _S(n, str)         [ERR_MAP(n)] = str, >> +#include >> +#undef _S >> +  }; >> +const size_t _sys_errlist_internal_len = array_length (_sys_errlist_internal); >> + >> +/* Include to get the definitions for sys_nerr/_sys_nerr.  */ >> +#include >> diff --git a/stdio-common/errlist-data.S b/stdio-common/errlist-data.S >> new file mode 100644 >> index 0000000000..870b3f40c9 >> --- /dev/null >> +++ b/stdio-common/errlist-data.S >> @@ -0,0 +1,7 @@ >> +#ifdef SHARED >> +# include "errlist-data-aux-shared.S" >> +#else >> +# include "errlist-data-aux.S" >> +#endif >> + >> +#include >> diff --git a/stdio-common/errlist.c b/stdio-common/errlist.c >> index 1c09a31a7a..4c0a0a218d 100644 >> --- a/stdio-common/errlist.c >> +++ b/stdio-common/errlist.c >> @@ -16,29 +16,17 @@ >>    License along with the GNU C Library; if not, see >>    .  */ >> >> -#include >> +#include >> +#include >> #include >> #include >> -#include >> - >> -#ifndef ERR_MAP >> -# define ERR_MAP(n) n >> -#endif >> - >> -const char *const _sys_errlist_internal[] = >> -  { >> -#define _S(n, str)         [ERR_MAP(n)] = str, >> -#include >> -#undef _S >> -  }; >> +#include >> >> const char * >> __get_errlist (int errnum) >> { >>   int mapped = ERR_MAP (errnum); >> -  if (mapped >= 0 && mapped < array_length (_sys_errlist_internal)) >> +  if (mapped >= 0 && mapped < _sys_errlist_internal_len) >>     return _sys_errlist_internal[mapped]; >>   return NULL; >> } >> - >> -#include >> diff --git a/sysdeps/mach/hurd/errlist.c b/sysdeps/mach/hurd/err_map.h >> similarity index 83% >> rename from sysdeps/mach/hurd/errlist.c >> rename to sysdeps/mach/hurd/err_map.h >> index 2d782ffc67..22d21ca9f1 100644 >> --- a/sysdeps/mach/hurd/errlist.c >> +++ b/sysdeps/mach/hurd/err_map.h >> @@ -1,4 +1,5 @@ >> -/* Copyright (C) 1998-2022 Free Software Foundation, Inc. >> +/* Internal errno names mapping definition.  Hurd version. >> +   Copyright (C) 2022 Free Software Foundation, Inc. >>    This file is part of the GNU C Library. >> >>    The GNU C Library is free software; you can redistribute it and/or >> @@ -15,7 +16,11 @@ >>    License along with the GNU C Library; if not, see >>    .  */ >> >> +#ifndef _ERR_MAP_H >> +#define _ERR_MAP_H >> + >> #include >> >> #define ERR_MAP(value) err_get_code (value) >> -#include >> + >> +#endif >> diff --git a/sysdeps/unix/sysv/linux/alpha/errlist-compat.c b/sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h >> similarity index 100% >> rename from sysdeps/unix/sysv/linux/alpha/errlist-compat.c >> rename to sysdeps/unix/sysv/linux/alpha/errlist-compat-data.h >> diff --git a/sysdeps/unix/sysv/linux/errlist-compat.c b/sysdeps/unix/sysv/linux/errlist-compat-data.h >> similarity index 100% >> rename from sysdeps/unix/sysv/linux/errlist-compat.c >> rename to sysdeps/unix/sysv/linux/errlist-compat-data.h >> diff --git a/sysdeps/unix/sysv/linux/errlist-compat.h b/sysdeps/unix/sysv/linux/errlist-compat.h >> index a09b38f243..33008863f8 100644 >> --- a/sysdeps/unix/sysv/linux/errlist-compat.h >> +++ b/sysdeps/unix/sysv/linux/errlist-compat.h >> @@ -20,6 +20,7 @@ >> #define _ERRLIST_COMPAT_H >> >> #include >> +#include >> >> /* Define new compat symbols for symbols  _sys_errlist, sys_errlist, >>    _sys_nerr, and sys_nerr for version VERSION with NUMBERERR times number of >> @@ -27,17 +28,25 @@ >>    Both _sys_errlist and sys_errlist alias to _sys_errlist_internal symbol >>    (defined on errlist.c) while _sys_nerr and sys_nerr created new variable >>    with the expected size.  */ >> -#define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION)                  \ >> -  const int __##VERSION##_sys_nerr = NUMBERERR;                     \ >> -  strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr);          \ >> -  declare_symbol_alias (__ ## VERSION ## _sys_errlist, _sys_errlist_internal,\ >> -            object, NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH));    \ >> -  declare_symbol_alias (__ ## VERSION ## __sys_errlist,                 \ >> -            _sys_errlist_internal, object,                 \ >> -            NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH));         \ >> -  compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION);         \ >> -  compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION);      \ >> -  compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION);  \ >> -  compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION);\ >> +#ifdef __ASSEMBLER__ >> +# define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION)                 \ >> +  declare_object_symbol_alias (__ ## VERSION ## _sys_errlist,            \ >> +                   _sys_errlist_internal,                \ >> +                   NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH))        \ >> +                   ASM_LINE_SEP                    \ >> +  declare_object_symbol_alias (__ ## VERSION ## __sys_errlist,            \ >> +                   _sys_errlist_internal,                 \ >> +                   NUMBERERR * (ULONG_WIDTH / UCHAR_WIDTH))        \ >> +                   ASM_LINE_SEP                    \ >> +  compat_symbol (libc, __## VERSION ## _sys_errlist, sys_errlist, VERSION)  \ >> +         ASM_LINE_SEP                            \ >> +  compat_symbol (libc, __## VERSION ## __sys_errlist, _sys_errlist, VERSION) >> +#else >> +# define DEFINE_COMPAT_ERRLIST(NUMBERERR, VERSION)                 \ >> +  const int __##VERSION##_sys_nerr = NUMBERERR;                    \ >> +  strong_alias (__##VERSION##_sys_nerr, __##VERSION##__sys_nerr);        \ >> +  compat_symbol (libc, __## VERSION ## _sys_nerr, sys_nerr, VERSION);        \ >> +  compat_symbol (libc, __## VERSION ## __sys_nerr, _sys_nerr, VERSION); >> +#endif >> >> #endif >> diff --git a/sysdeps/unix/sysv/linux/hppa/errlist-compat.c b/sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h >> similarity index 100% >> rename from sysdeps/unix/sysv/linux/hppa/errlist-compat.c >> rename to sysdeps/unix/sysv/linux/hppa/errlist-compat-data.h >> diff --git a/sysdeps/unix/sysv/linux/mips/errlist-compat.c b/sysdeps/unix/sysv/linux/mips/errlist-compat-data.h >> similarity index 100% >> rename from sysdeps/unix/sysv/linux/mips/errlist-compat.c >> rename to sysdeps/unix/sysv/linux/mips/errlist-compat-data.h >> diff --git a/sysdeps/unix/sysv/linux/sparc/errlist-compat.c b/sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h >> similarity index 100% >> rename from sysdeps/unix/sysv/linux/sparc/errlist-compat.c >> rename to sysdeps/unix/sysv/linux/sparc/errlist-compat-data.h >> --  >> 2.34.1 >>