From patchwork Tue May 16 12:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69468 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 54195385382F for ; Tue, 16 May 2023 12:49:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 54195385382F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241348; bh=Xn0By5sGqPOhO811Xsz586ecOpQRM0YmnndTyYTCeCw=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=VzXRRhShvdLjuYvH/6oTYdbKGhLXzNARfwKyaXJd4kCO1CCHshQZnjgu6zcxVDqMB WTyB5fbM35P6uhckc7pi0ag0o+mdL1ITZ1h3eagIMBf+nMPivXzer14D/XzAq8EdI7 5zMtzwnYoWpqgSFXRutguk2IFNpZyM8gFJTtVFt4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E04E13856DEC for ; Tue, 16 May 2023 12:48:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E04E13856DEC Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-328-gU0kAZc2PzOqrcGCZGZ4_Q-1; Tue, 16 May 2023 08:48:37 -0400 X-MC-Unique: gU0kAZc2PzOqrcGCZGZ4_Q-1 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-55a04468981so291338137b3.0 for ; Tue, 16 May 2023 05:48:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241316; x=1686833316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xn0By5sGqPOhO811Xsz586ecOpQRM0YmnndTyYTCeCw=; b=Tg9if/tBWQ0pChm6qzgqhOrWgBXv3XZ8SktZX6LP0qIXG3H0IdqXJCHeglryY/h8Hv TXbVjj3yjtJTfDgy52IDr8Jk5YO14BcTFdEzqwk8daeN5rMPGQ5n58GaCVjH5+ax673V s9KbF4ZsDSWGdi/z8PfRT6x69fpuXp9dlJcVvPO6lbePujJ0PQdZThKS1Duk2GyeDOcf rlbrZGJ5hTsvinnvBQwElQ/YcAXbhxEYThi9xxfXIysegjthYedTaZmZKBl7G87I3yGB Mq+LyxveguusCl7mYTEtTlEsobHDYibJKj7/wfxB+0MvN8fxJUc86QMAxMDfUXCtxpXw GG3Q== X-Gm-Message-State: AC+VfDxzBOBX8EoEnaOpLHRdQ8fxUdUCleOhs1zRLn1UzT+juvg6lGPv LVv8OX+UctCVDEylVdRd51UpRRuhx/wHALII7sBUc8gIsQWhEsBlO9/wkzGXuQKhVTYgNg9BWCu c6V22KLhHFXf3KkWa0ylhRoo0yz6W2mjLCVxS0AiR8E4TDxaPssGpQ/aQWkJA2AddjFb61dIIPB e6CA== X-Received: by 2002:a81:6c94:0:b0:54f:b615:ab5d with SMTP id h142-20020a816c94000000b0054fb615ab5dmr34676804ywc.14.1684241315994; Tue, 16 May 2023 05:48:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6GVxETxDp9HrRvuL28Fe7KDWEio9DeRCbLWeYAn9t6q87VSJWk9QfINXEo19A2ezRAZSTO7g== X-Received: by 2002:a81:6c94:0:b0:54f:b615:ab5d with SMTP id h142-20020a816c94000000b0054fb615ab5dmr34676795ywc.14.1684241315705; Tue, 16 May 2023 05:48:35 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id u129-20020a816087000000b0055a85ab2704sm577387ywb.20.2023.05.16.05.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:34 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 5/8] stdio-common: Reformat Makefile. Date: Tue, 16 May 2023 08:48:21 -0400 Message-Id: <20230516124824.146416-6-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230516124824.146416-1-carlos@redhat.com> References: <20230516124824.146416-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow Makefile. Sort using scripts/sort-makefile-lines.py. Code generation is changed as routines are linked in sorted order as expected. No regressions on x86_64 and i686. --- stdio-common/Makefile | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 7cf8d814ea..1b4997afc8 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -22,7 +22,12 @@ subdir := stdio-common include ../Makeconfig -headers := stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h +headers := \ + bits/printf-ldbl.h \ + bits/stdio_lim.h \ + printf.h \ + stdio_ext.h \ + # headers routines := \ _itoa \ @@ -41,18 +46,18 @@ routines := \ getw \ grouping_iterator \ iovfscanf \ - isoc99_fscanf \ - isoc99_scanf \ - isoc99_sscanf \ - isoc99_vfscanf \ - isoc99_vscanf \ - isoc99_vsscanf \ isoc23_fscanf \ isoc23_scanf \ isoc23_sscanf \ isoc23_vfscanf \ isoc23_vscanf \ isoc23_vsscanf \ + isoc99_fscanf \ + isoc99_scanf \ + isoc99_sscanf \ + isoc99_vfscanf \ + isoc99_vscanf \ + isoc99_vsscanf \ itoa-digits \ itoa-udigits \ itowa-digits \ @@ -238,9 +243,9 @@ tests := \ tst-unlockedio \ tst-vfprintf-mbs-prec \ tst-vfprintf-user-type \ + tst-vfprintf-width-i18n \ tst-vfprintf-width-prec \ tst-vfprintf-width-prec-alloc \ - tst-vfprintf-width-i18n \ tst-wc-printf \ tstdiomisc \ tstgetln \ @@ -250,6 +255,7 @@ tests := \ tests-container += \ tst-popen3 + # tests-container generated += \ errlist-data-aux-shared.S \ @@ -262,7 +268,11 @@ tests-internal = \ tst-grouping_iterator \ # tests-internal -test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble +test-srcs = \ + tst-printf \ + tst-printfsz-islongdouble \ + tst-unbputc \ + # test-srcs ifeq ($(run-built-tests),yes) tests-special += \ @@ -340,7 +350,7 @@ LOCALES := \ ja_JP.EUC-JP \ ps_AF.UTF-8 \ tg_TJ.UTF-8 \ - # LOCALES + # LOCALES include ../gen-locales.mk $(objpfx)bug14.out: $(gen-locales)