From patchwork Tue May 16 12:48:18 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: 69470 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 8E52E385B526 for ; Tue, 16 May 2023 12:49:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E52E385B526 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684241378; bh=+ZeqwfQyHf37QG54OnaNb81lKQekfXW0r/EvAGVVbec=; 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=SIIN6vuOo7SodlhrzSlTZ6CSZrQbhNlKVtQCykAK0F5EYl9fSy2Sy5z2xSZkKaio+ /I6KkB8PDVCAsS3d9FEdO+d+vet/jNtOHBl/dVbe8KKZyA8pmIFj0oxd4t/v0hmgTG 3a5pLgXk1U0F6ckLPH7BoHLYInxGx1j2x9On7U0k= 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 F32AD385773F for ; Tue, 16 May 2023 12:48:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F32AD385773F Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-34-GcgrJtSFPBiEA8sXONKceg-1; Tue, 16 May 2023 08:48:32 -0400 X-MC-Unique: GcgrJtSFPBiEA8sXONKceg-1 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-ba71ed074ceso5005106276.0 for ; Tue, 16 May 2023 05:48:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241311; x=1686833311; 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=+ZeqwfQyHf37QG54OnaNb81lKQekfXW0r/EvAGVVbec=; b=aIjr+oJXG6CdRzigMWL/ViSvFwfApOFat9TBuM07sHcJxjVJaZrTagm3jwnjRJOnLP tbwSNz9/lyTEv6h99YDCrkOoKX4i6J0lbAz+l2wgiWlfj+ydQzKtTmYhbyZ87MkxI5Qm nawkXq0E8TMuCIqM9tL5HqEaA33Duw91zGIM9qXYzMLIOTDlRCIr360ybRLUOIHd81Yk z/Xwlp6pzWgsmz85SuJLD1H+6wbkaVzSf5A5Mm28EQW/khIB+Ea28ln54teQEhhrLYP0 /Cm9tk3Opz53PXGWw3GPKvNjJuN/kwnF8lPdLOf8Hm9pKjlpwIOjQM23t/DD0FMnO4q0 QSxQ== X-Gm-Message-State: AC+VfDwT8GTD4MxrIAb4vsfHCCNsjYZ4QSroYoR+IGR1jbwBqAUsOMzS aIxN6ipUSO53Dm2BETKGxuudT0qlJ3gh6lpacjqSgicOVFEucmpjqH6qLW8rIu2rpb3fMDttyBt 5kMbpPEp7QuU8SLNYHG/nxFvFsDi/S9mH6K449XSL3na/9EHhH65SmkuxsPUMG8J01BGmLVrQ1R 6H5w== X-Received: by 2002:a25:c086:0:b0:b9e:67ab:4f36 with SMTP id c128-20020a25c086000000b00b9e67ab4f36mr33065397ybf.10.1684241311554; Tue, 16 May 2023 05:48:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ68HhZt5gcIWR3dbKOHtuXZt5obi62yHDamA6Kq5bWjVCCm7p4HQzbPKfTRKAxUrTJIfvNERA== X-Received: by 2002:a25:c086:0:b0:b9e:67ab:4f36 with SMTP id c128-20020a25c086000000b00b9e67ab4f36mr33065383ybf.10.1684241311224; Tue, 16 May 2023 05:48:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:30 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 2/8] debug: Reformat Makefile. Date: Tue, 16 May 2023 08:48:18 -0400 Message-Id: <20230516124824.146416-3-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.5 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" Fix list terminator whitspace. Sort using scripts/sort-makefile-lines.py. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- debug/Makefile | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/debug/Makefile b/debug/Makefile index a8b4036cdc..096df27aeb 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -29,6 +29,7 @@ headers := execinfo.h # login/Makefile instead. If that subdir is omitted from the # build, its _FORTIFY_SOURCE support will be too. routines = \ + $(static-only-routines) \ ____longjmp_chk \ asprintf_chk \ backtrace \ @@ -113,7 +114,6 @@ routines = \ wmempcpy_chk \ wmemset_chk \ wprintf_chk \ - $(static-only-routines) \ # routines static-only-routines := stack_chk_fail_local @@ -267,23 +267,25 @@ CFLAGS-tst-ssp-1.c += -fstack-protector-all CFLAGS-tst-sprintf-fortify-unchecked.c = \ -fno-builtin-vsprintf -fno-builtin-__vsprintf_chk -tests = backtrace-tst \ - tst-longjmp_chk \ - test-strcpy_chk \ - test-stpcpy_chk \ - tst-longjmp_chk2 \ - tst-backtrace2 \ - tst-backtrace3 \ - tst-backtrace4 \ - tst-backtrace5 \ - tst-backtrace6 \ - tst-realpath-chk \ - tst-sprintf-fortify-unchecked \ - $(tests-all-chk) +tests = \ + $(tests-all-chk) \ + backtrace-tst \ + test-stpcpy_chk \ + test-strcpy_chk \ + tst-backtrace2 \ + tst-backtrace3 \ + tst-backtrace4 \ + tst-backtrace5 \ + tst-backtrace6 \ + tst-longjmp_chk \ + tst-longjmp_chk2 \ + tst-realpath-chk \ + tst-sprintf-fortify-unchecked \ + # tests tests-time64 += \ - $(tests-all-time64-chk) \ - # tests-time64 + $(tests-all-time64-chk) \ + # tests-time64 ifeq ($(have-ssp),yes) tests += tst-ssp-1