From patchwork Wed May 24 04:18:49 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: 1785520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=oEM1K9u1; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQycg3fxTz20PY for ; Wed, 24 May 2023 14:19:15 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3DA9B3858410 for ; Wed, 24 May 2023 04:19:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3DA9B3858410 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684901953; bh=SmRoZ8vj5JPeGif6c64aIaGCQReftz/7F0+IUcB5ZOM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=oEM1K9u1vYLrx/x0ARjJGPYJjl/lqM7FFtW1KQMjeYvovpwc7rXRftmNclT+fPe/z FkLxpL2xzqGIiYpR1+Jhwv36KoMPaY/lfV09JTZDXMG7tXwfBWXtw1JSIBEwBSObiP 4dqxnHlExi2jkGa/N/NSAo+7jddyEJqmAt9LrF58= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id C69B63858D37 for ; Wed, 24 May 2023 04:18:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C69B63858D37 Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-647-kmVspy0nOymGp7NTQWf00Q-1; Wed, 24 May 2023 00:18:53 -0400 X-MC-Unique: kmVspy0nOymGp7NTQWf00Q-1 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-babb3528ce5so885371276.1 for ; Tue, 23 May 2023 21:18:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684901932; x=1687493932; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SmRoZ8vj5JPeGif6c64aIaGCQReftz/7F0+IUcB5ZOM=; b=P3Kmg1LX441mFnlg9hwfEreA43I4bFFPOavPPA1+RmnAWUrCNqf1w1JJOyrnuHDiG5 jDk52CSEVVA7pAsa6i+GdoR/ycK3eCN0HzuUYgTK8RhKeqwn/xTqu9YueEIxQ4PAIJ6w 4DZh7Rd/TUmAnCVhMKF06JeFUMHciaoxR00q5tMqlc+ZLd2/OJ1qIfLTcf2wf0lrSVlV eNAwa3cLrGwIwgADdWP3ztvGxur7X5AqSTtw42F0OcJx+NThhaEPXaUJDn4IqvIKsQhB oJXvoU4mzg52WFeiCQSVwlZQ9wdRDH6YQ6TuqGyYsqgObOrymII194ooikifMQCvtfjS kNtQ== X-Gm-Message-State: AC+VfDzTjMkgi+WrJ0BYKfQicpkpyCoNjZvWqKj2UFd6Cpfz50S3mvML F6tIr5sd0XBiO6wHEGZ8xlaElDk9kKZvQyZ0CS3TEcgMqdAtHfp0NKskdSHL+N3APHyISPcHKVh MmpE4w89rvA0IdMLbRH7MzrKtdWXyblfwU+gBiPPpVh/5Km9s6yR6vtM19D9wzWZSRjyB+E+3LC i0gg== X-Received: by 2002:a25:1845:0:b0:bab:f55d:e290 with SMTP id 66-20020a251845000000b00babf55de290mr8874884yby.10.1684901932517; Tue, 23 May 2023 21:18:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7w91MQ9ZObMgasKQvOoQGJdZCDXMN2EHYVRxEHFdAefvAII/Xt3LSe27WEJxsZrG+m1LvRZw== X-Received: by 2002:a25:1845:0:b0:bab:f55d:e290 with SMTP id 66-20020a251845000000b00babf55de290mr8874873yby.10.1684901932176; Tue, 23 May 2023 21:18:52 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id t67-20020a818346000000b0055a503ca1e8sm3394331ywf.109.2023.05.23.21.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 21:18:51 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED] support: Reformat Makefile. Date: Wed, 24 May 2023 00:18:49 -0400 Message-Id: <20230524041849.2112771-1-carlos@redhat.com> X-Mailer: git-send-email 2.40.1 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+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Add list end markers. Sort text using scripts/sort-makefile-lines.py. No code generation changes observed in non-test binary artifacts. No regressions on x86_64 and i686. --- support/Makefile | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/support/Makefile b/support/Makefile index 71d5148513..92f1a2468a 100644 --- a/support/Makefile +++ b/support/Makefile @@ -41,7 +41,7 @@ libsupport-routines = \ resolv_response_context_free \ resolv_test \ set_fortify_handler \ - support_stack_alloc \ + support-open-dev-null-range \ support-xfstat \ support-xfstat-time64 \ support-xstat \ @@ -67,12 +67,11 @@ libsupport-routines = \ support_isolate_in_subprocess \ support_mutex_pi_monotonic \ support_need_proc \ + support_openpty \ support_path_support_time64 \ + support_paths \ support_process_state \ support_ptrace \ - support-open-dev-null-range \ - support_openpty \ - support_paths \ support_quote_blob \ support_quote_blob_wide \ support_quote_string \ @@ -84,6 +83,7 @@ libsupport-routines = \ support_shared_allocate \ support_small_stack_thread_attribute \ support_socket_so_timestamp_time64 \ + support_stack_alloc \ support_stat_nanoseconds \ support_subprocess \ support_test_compare_blob \ @@ -96,11 +96,11 @@ libsupport-routines = \ support_write_file_string \ temp_file \ timespec \ - timespec-time64 \ timespec-add \ timespec-add-time64 \ timespec-sub \ timespec-sub-time64 \ + timespec-time64 \ write_message \ xaccept \ xaccept4 \ @@ -108,6 +108,7 @@ libsupport-routines = \ xbind \ xcalloc \ xchdir \ + xchmod \ xchroot \ xclock_gettime \ xclock_gettime_time64 \ @@ -115,7 +116,6 @@ libsupport-routines = \ xclock_settime_time64 \ xclone \ xclose \ - xchmod \ xconnect \ xcopy_file_range \ xdlfcn \ @@ -146,11 +146,14 @@ libsupport-routines = \ xpipe \ xpoll \ xposix_memalign \ + xposix_spawn \ + xposix_spawn_file_actions_addclose \ + xposix_spawn_file_actions_adddup2 \ xpthread_attr_destroy \ xpthread_attr_init \ + xpthread_attr_setaffinity_np \ xpthread_attr_setdetachstate \ xpthread_attr_setguardsize \ - xpthread_attr_setaffinity_np \ xpthread_attr_setstack \ xpthread_attr_setstacksize \ xpthread_barrier_destroy \ @@ -161,8 +164,8 @@ libsupport-routines = \ xpthread_barrierattr_setpshared \ xpthread_cancel \ xpthread_check_return \ - xpthread_cond_wait \ xpthread_cond_signal \ + xpthread_cond_wait \ xpthread_create \ xpthread_detach \ xpthread_join \ @@ -181,8 +184,8 @@ libsupport-routines = \ xpthread_mutexattr_setrobust \ xpthread_mutexattr_settype \ xpthread_once \ - xpthread_rwlock_init \ xpthread_rwlock_destroy \ + xpthread_rwlock_init \ xpthread_rwlock_rdlock \ xpthread_rwlock_unlock \ xpthread_rwlock_wrlock \ @@ -202,9 +205,6 @@ libsupport-routines = \ xsignal \ xsigstack \ xsocket \ - xposix_spawn \ - xposix_spawn_file_actions_addclose \ - xposix_spawn_file_actions_adddup2 \ xstrdup \ xstrndup \ xsymlink \ @@ -213,6 +213,7 @@ libsupport-routines = \ xuselocale \ xwaitpid \ xwrite \ + # libsupport-routines libsupport-static-only-routines := $(libsupport-routines) # Only build one variant of the library. @@ -277,8 +278,16 @@ LDLIBS-test-container = $(libsupport) others += test-container others-noinstall += test-container -others += shell-container echo-container true-container -others-noinstall += shell-container echo-container true-container +others += \ + echo-container \ + shell-container \ + true-container \ + # others +others-noinstall += \ + echo-container \ + shell-container \ + true-container \ + # others-noinstall others += $(LINKS_DSO_PROGRAM) others-noinstall += $(LINKS_DSO_PROGRAM) @@ -314,6 +323,7 @@ tests = \ tst-timespec \ tst-xreadlink \ tst-xsigstack \ + # tests ifeq ($(run-built-tests),yes) tests-special = \