From patchwork Sun Feb 25 18:39:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 1903970 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SsK0fM5a; dkim-atps=neutral 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=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TjXf36lRFz23cb for ; Mon, 26 Feb 2024 05:41:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CE4A238582A3 for ; Sun, 25 Feb 2024 18:41:45 +0000 (GMT) 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 BE5713858C41 for ; Sun, 25 Feb 2024 18:40:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE5713858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BE5713858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886427; cv=none; b=K7g8OLvHaWBALddEOFrL0EioVKbAHmhhSZzMcfeyzwB01AhKlLDepqWgQxM+E2zmFWDxVCqi210F7qWD61wiesvUcet4mZYrxArwrVwAAC5Z5KN2nzLod2FMg6+7XZjkXA33YrGLJG4nJSU70QN9ZScn41t0omaKW3Ai0hDy3mc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886427; c=relaxed/simple; bh=3dI6ti8SCfjOxaNCavTb4SJ8HYCPC6SAVhMfG95T8Sw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=atX1g8n0hvRrF1cHBCsl1Qj8w4bsoUG14tkV7nhlHavkhxPC4GlFZ14r8rvEJu7cxPJB9BeqaDE+zwNyLV6pmkqcJGXlt1nuvOgM+g04aIyBOW/OoYwY2H5hSKCDbQykrh81xgY0+cF3DdKhwGkoSWzPf/tKmU1CGMOLjeQiQ4U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vDF8tpPmznt2BcZD1skbY0j8TrXhwwtp6keJxhQIdlM=; b=SsK0fM5ajaWDrOLCXTo0AxspVrg+pv7ebyBAyz0FuiOxuT+eSxp1MmbDV8r75+PIv67y5J 5h8uK1TgMiV3Ogz/aCJPzGOkMz3r2zczExPbtxldsXQbny2TafDq3qObDJoPsoV8rvVeY6 WearDeMYBon4msMu+pH4Iiv9cnvutLQ= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-BzC6Cn-KPEiiL6yFQrIbBA-1; Sun, 25 Feb 2024 13:40:23 -0500 X-MC-Unique: BzC6Cn-KPEiiL6yFQrIbBA-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-42e7dc9a7e6so9002681cf.0 for ; Sun, 25 Feb 2024 10:40:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886422; x=1709491222; 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=vDF8tpPmznt2BcZD1skbY0j8TrXhwwtp6keJxhQIdlM=; b=KKD97O43wK4JvEhbfHNiLno2nhz7clrfz2Zw1/TZzX9gc+YA5Y5n51cL7BpF+yeWRH 9cESH2/+ssNAmxvPlN+839JhdCpFzdEQsEHJfeNBYcPEexCNL9xP3t0NgYZBHQCkirh3 UbKL4mnJTKo1Ju2dQP2D9LMdytTX1jFN/VO57rsFJj4kmxmA6RFhi/q/ckTBfoeW2K22 XPkFY01IS1a7mT9jiYGSzUVepzE7KQNsDOE3NORK+Y4H7a6tmuKtqMsiUny7QaAc2/l3 AWA/Y6PqAmO5A2yoqaEVQJL0ZJi3JYAdZ4S0FDYkXOrXjcYtgLMyCOWgu2eX9utOxCQU 2kVw== X-Gm-Message-State: AOJu0YyxsiyI8Y60XEfD4utqL+/sKeocKxSYi1dunheXOw801sVI1/m9 0z9qLPr05hd8Pcpbl0pXo9LOwNLuAifPCUhU6uiNFKQJ2PHIrAJnWfbUI1Y/asQF4DXxPHfNXNp XdxtxYnJGABhlkeLnS1oRuh0UHSM6RiincRGuayqY4y737OXUdGX2uCH2qwYM/WXam+3lWi8M0e /9nM4RchvteNRUbWENszRonbR4dxt+kIKFCpyBrqg= X-Received: by 2002:a05:622a:19a0:b0:42e:5c0b:a9ca with SMTP id u32-20020a05622a19a000b0042e5c0ba9camr7387776qtc.49.1708886422272; Sun, 25 Feb 2024 10:40:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHkYo/iTFzFmJq3x3lhakREdCyR97XJS/W6rWN4yZRavVZ/O3hid5CP3qYs6flVAo/mfOHjQw== X-Received: by 2002:a05:622a:19a0:b0:42e:5c0b:a9ca with SMTP id u32-20020a05622a19a000b0042e5c0ba9camr7387754qtc.49.1708886421849; Sun, 25 Feb 2024 10:40:21 -0800 (PST) Received: from localhost.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id y8-20020ac87088000000b0042e6ad88de0sm1643975qto.73.2024.02.25.10.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:21 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 08/10] htl: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:47 -0500 Message-ID: <20240225183956.2534939-8-carlos@redhat.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240225183956.2534939-1-carlos@redhat.com> References: <20240225183956.2534939-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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, RCVD_IN_SORBS_WEB, 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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Reflow and sort Makefile. Code generation changes present due to link order changes. No regressions on x86_64 and i686. --- htl/Makefile | 324 +++++++++++++++++++++++++++++---------------------- 1 file changed, 183 insertions(+), 141 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index fd4d463ab0..4028e5a240 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -24,150 +24,192 @@ SYSDEPS := lockfile LCLHDRS := -libpthread-routines := pt-attr pt-attr-destroy \ - pt-attr-getguardsize \ - pt-attr-getscope \ - pt-attr-getstack pt-attr-getstackaddr pt-attr-getstacksize \ - pt-attr-init pt-attr-setguardsize \ - pt-attr-setschedparam \ - pt-attr-setscope pt-attr-setstack \ - pt-attr-setstackaddr pt-attr-setstacksize \ - \ - pt-barrier-destroy pt-barrier-init pt-barrier-wait \ - pt-barrier pt-barrierattr-destroy pt-barrierattr-init \ - pt-barrierattr-getpshared pt-barrierattr-setpshared \ - \ - pt-destroy-specific pt-init-specific \ - pt-key-create pt-key-delete \ - pt-getspecific pt-setspecific \ - \ - pt-once \ - \ - pt-alloc \ - pt-create \ - pt-getattr \ - pt-dealloc \ - pt-detach \ - pt-exit \ - pt-initialize \ - pt-join \ - pt-sigmask \ - pt-spin-inlines \ - pt-cleanup \ - pt-setcancelstate \ - pt-setcanceltype \ - pt-testcancel \ - pt-cancel \ - \ - pt-mutexattr-destroy pt-mutexattr-init \ - pt-mutexattr-getprioceiling pt-mutexattr-getprotocol \ - pt-mutexattr-getpshared pt-mutexattr-gettype \ - pt-mutexattr-setprioceiling pt-mutexattr-setprotocol \ - pt-mutexattr-setpshared pt-mutexattr-settype \ - pt-mutexattr-getrobust pt-mutexattr-setrobust \ - \ - pt-mutex-init pt-mutex-destroy pt-mutex-checklocked \ - pt-mutex-lock pt-mutex-trylock pt-mutex-timedlock \ - pt-mutex-unlock \ - pt-mutex-transfer-np \ - pt-mutex-getprioceiling pt-mutex-setprioceiling \ - pt-mutex-consistent \ - \ - pt-rwlock-attr \ - pt-rwlockattr-init pt-rwlockattr-destroy \ - pt-rwlockattr-getpshared pt-rwlockattr-setpshared \ - \ - pt-rwlock-init pt-rwlock-destroy \ - pt-rwlock-rdlock pt-rwlock-tryrdlock \ - pt-rwlock-trywrlock pt-rwlock-wrlock \ - pt-rwlock-timedrdlock pt-rwlock-timedwrlock \ - pt-rwlock-unlock \ - \ - pt-cond \ - pt-condattr-init pt-condattr-destroy \ - pt-condattr-getclock pt-condattr-getpshared \ - pt-condattr-setclock pt-condattr-setpshared \ - \ - pt-cond-destroy pt-cond-init \ - pt-cond-brdcast \ - pt-cond-signal \ - pt-cond-wait \ - pt-cond-timedwait \ - pt-hurd-cond-wait \ - pt-hurd-cond-timedwait \ - \ - pt-stack-alloc \ - pt-thread-alloc \ - pt-thread-start \ - pt-thread-terminate \ - pt-startup \ - \ - pt-getconcurrency pt-setconcurrency \ - \ - pt-block \ - pt-timedblock \ - pt-block-intr \ - pt-timedblock-intr \ - pt-wakeup \ - pt-docancel \ - pt-sysdep \ - pt-setup \ - pt-machdep \ - pt-spin \ - \ - pt-sigstate-init \ - pt-sigstate-destroy \ - pt-sigstate \ - \ - pt-kill \ - pt-getcpuclockid \ - \ - pt-setschedprio \ - pt-yield \ - \ - sem_close sem-destroy sem-getvalue sem-init sem_open \ - sem-post sem-timedwait sem-trywait sem_unlink \ - sem-wait sem-waitfast \ - sem_routines \ - \ - cancellation \ - cthreads-compat \ - herrno \ - $(SYSDEPS) - -headers := \ - pthread.h \ - semaphore.h \ - \ - bits/pthread.h \ - bits/pthread-np.h \ - bits/pthreadtypes.h \ - bits/pthreadtypes-arch.h \ - bits/thread-shared-types.h \ - bits/types/struct___pthread_mutex.h \ - bits/types/struct___pthread_cond.h \ - bits/types/struct___pthread_condattr.h \ - bits/types/__pthread_spinlock_t.h \ - bits/spin-lock-inline.h \ - bits/cancelation.h \ - bits/types/struct___pthread_attr.h \ - bits/types/struct___pthread_barrierattr.h \ - bits/types/struct___pthread_barrier.h \ - bits/types/__pthread_key.h \ - bits/types/struct___pthread_once.h \ - bits/types/struct___pthread_mutexattr.h \ - bits/types/struct___pthread_rwlock.h \ - bits/types/struct___pthread_rwlockattr.h \ - bits/types/__pthread_t.h \ - bits/types/__thrd_t.h \ - bits/semaphore.h +libpthread-routines := \ + pt-attr \ + pt-attr-destroy \ + pt-attr-getguardsize \ + pt-attr-getscope \ + pt-attr-getstack \ + pt-attr-getstackaddr \ + pt-attr-getstacksize \ + pt-attr-init \ + pt-attr-setguardsize \ + pt-attr-setschedparam \ + pt-attr-setscope \ + pt-attr-setstack \ + pt-attr-setstackaddr \ + pt-attr-setstacksize \ + pt-barrier-destroy \ + pt-barrier-init \ + pt-barrier-wait \ + pt-barrier \ + pt-barrierattr-destroy \ + pt-barrierattr-init \ + pt-barrierattr-getpshared \ + pt-barrierattr-setpshared \ + pt-destroy-specific \ + pt-init-specific \ + pt-key-create \ + pt-key-delete \ + pt-getspecific \ + pt-setspecific \ + pt-once \ + pt-alloc \ + pt-create \ + pt-getattr \ + pt-dealloc \ + pt-detach \ + pt-exit \ + pt-initialize \ + pt-join \ + pt-sigmask \ + pt-spin-inlines \ + pt-cleanup \ + pt-setcancelstate \ + pt-setcanceltype \ + pt-testcancel \ + pt-cancel \ + pt-mutexattr-destroy \ + pt-mutexattr-init \ + pt-mutexattr-getprioceiling \ + pt-mutexattr-getprotocol \ + pt-mutexattr-getpshared \ + pt-mutexattr-gettype \ + pt-mutexattr-setprioceiling \ + pt-mutexattr-setprotocol \ + pt-mutexattr-setpshared \ + pt-mutexattr-settype \ + pt-mutexattr-getrobust \ + pt-mutexattr-setrobust \ + pt-mutex-init \ + pt-mutex-destroy \ + pt-mutex-checklocked \ + pt-mutex-lock \ + pt-mutex-trylock \ + pt-mutex-timedlock \ + pt-mutex-unlock \ + pt-mutex-transfer-np \ + pt-mutex-getprioceiling \ + pt-mutex-setprioceiling \ + pt-mutex-consistent \ + pt-rwlock-attr \ + pt-rwlockattr-init \ + pt-rwlockattr-destroy \ + pt-rwlockattr-getpshared \ + pt-rwlockattr-setpshared \ + pt-rwlock-init \ + pt-rwlock-destroy \ + pt-rwlock-rdlock \ + pt-rwlock-tryrdlock \ + pt-rwlock-trywrlock \ + pt-rwlock-wrlock \ + pt-rwlock-timedrdlock \ + pt-rwlock-timedwrlock \ + pt-rwlock-unlock \ + pt-cond \ + pt-condattr-init \ + pt-condattr-destroy \ + pt-condattr-getclock \ + pt-condattr-getpshared \ + pt-condattr-setclock \ + pt-condattr-setpshared \ + pt-cond-destroy \ + pt-cond-init \ + pt-cond-brdcast \ + pt-cond-signal \ + pt-cond-wait \ + pt-cond-timedwait \ + pt-hurd-cond-wait \ + pt-hurd-cond-timedwait \ + pt-stack-alloc \ + pt-thread-alloc \ + pt-thread-start \ + pt-thread-terminate \ + pt-startup \ + pt-getconcurrency \ + pt-setconcurrency \ + pt-block \ + pt-timedblock \ + pt-block-intr \ + pt-timedblock-intr \ + pt-wakeup \ + pt-docancel \ + pt-sysdep \ + pt-setup \ + pt-machdep \ + pt-spin \ + pt-sigstate-init \ + pt-sigstate-destroy \ + pt-sigstate \ + pt-kill \ + pt-getcpuclockid \ + pt-setschedprio \ + pt-yield \ + sem_close \ + sem-destroy \ + sem-getvalue \ + sem-init \ + sem_open \ + sem-post \ + sem-timedwait \ + sem-trywait \ + sem_unlink \ + sem-wait \ + sem-waitfast \ + sem_routines \ + cancellation \ + cthreads-compat \ + herrno \ + $(SYSDEPS) \ + # libpthread-routine + +headers := \ + bits/cancelation.h \ + bits/pthread-np.h \ + bits/pthread.h \ + bits/pthreadtypes-arch.h \ + bits/pthreadtypes.h \ + bits/semaphore.h \ + bits/spin-lock-inline.h \ + bits/thread-shared-types.h \ + bits/types/__pthread_key.h \ + bits/types/__pthread_spinlock_t.h \ + bits/types/__pthread_t.h \ + bits/types/__thrd_t.h \ + bits/types/struct___pthread_attr.h \ + bits/types/struct___pthread_barrier.h \ + bits/types/struct___pthread_barrierattr.h \ + bits/types/struct___pthread_cond.h \ + bits/types/struct___pthread_condattr.h \ + bits/types/struct___pthread_mutex.h \ + bits/types/struct___pthread_mutexattr.h \ + bits/types/struct___pthread_once.h \ + bits/types/struct___pthread_rwlock.h \ + bits/types/struct___pthread_rwlockattr.h \ + pthread.h \ + semaphore.h \ + # headers distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal \ - pt-getschedparam pt-setschedparam pt-attr-getschedparam pt-attr-getinheritsched \ - pt-attr-setinheritsched pt-attr-getschedpolicy pt-attr-setschedpolicy pt-attr-getdetachstate \ - pt-attr-setdetachstate +routines := \ + alloca_cutoff \ + forward \ + htlfreeres \ + libc_pthread_init \ + pt-attr-getdetachstate \ + pt-attr-getinheritsched \ + pt-attr-getschedparam \ + pt-attr-getschedpolicy \ + pt-attr-setdetachstate \ + pt-attr-setinheritsched \ + pt-attr-setschedpolicy \ + pt-getschedparam \ + pt-nthreads \ + pt-pthread_self \ + pt-self pt-equal \ + pt-setschedparam \ + # routines shared-only-routines = forward extra-libs := libpthread