From patchwork Sun Feb 25 18:39:43 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: 86338 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 3A62B3858433 for ; Sun, 25 Feb 2024 18:41:19 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id 6C3713858C60 for ; Sun, 25 Feb 2024 18:40:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6C3713858C60 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 6C3713858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886419; cv=none; b=A8wmtCA7PyoFeDMDn3c4Tp0rneho882nQpDDL5yU241nL8LwYRcqDKkErNDGFrK404iHCw0TMnRzSFHOlQljPJQh1EW+Zm2pU79OsXxpoJmM9XqpUhb1eq4jucCZc44UqCwbLFtSJiPNDAGzAlIoLQOX/ScU+2tmnv1iSP8jvGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708886419; c=relaxed/simple; bh=ODK/m1oyUf26LOzMX6ibD6vfqVfs+sr7px+uEUd0kJk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=swkQ3UpihL6RvWwnpHAPKCExGCTN1n3/khf5e1XYyn/GZWOmDCnTaDsEsF1OlBpassGFbvd2MK0A2gzNZw2UUDX7hXZuBbO2qLK0Lr5rViq+d1El7fAOUiOKh3HOOjRTa6gsmrFpHIIQ2HtIlw3/BknELPX8qdg5663YE9Ade5k= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708886417; 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=ZZWIIrTSM6guq912iS0Z/zw9HjAGhxMykZjWAOPwKIg=; b=O5J9XbEYul+q/a2x7qjnT5mlMU73AbQVcnRNl2MjIBZaO5yUd0h8RR+0cc0hzpYwfnc33X Df+uKcPTEBiXo4Qg4FuCljBZDcsFDsWqOXLnycUGGobP8jBAyErQKuabdMViNEBWomAtEZ 0b+tfdxN7xesnhNkrDVIG6jgHsXzjmU= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-248-Nz4xm4LEOfOtss5XU9MVqQ-1; Sun, 25 Feb 2024 13:40:15 -0500 X-MC-Unique: Nz4xm4LEOfOtss5XU9MVqQ-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-42e4e9629f9so24699571cf.0 for ; Sun, 25 Feb 2024 10:40:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708886415; x=1709491215; 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=ZZWIIrTSM6guq912iS0Z/zw9HjAGhxMykZjWAOPwKIg=; b=bXFtqEUmrsM2LlSbCDRXucTXTkwZKsYbSsbyPMsbNmcoaDK8vviS/8M7noaNalOvoU JZDr1qjD3oCd5d25auFuhZZvD4KxxjWKEJczo8n3m4tgeQKN4NWObXYgDCqKBX5vF6Qg UUFtqbDuS/1t+9fYaQ+5bYDj5Q7SerZ5HJy0ESLOA3b1aLBbsC0nri7e7Zuogx+v5m4e +TqibLEQ7XOKeojR2tg+OIbJrVeD0IQAkalSpfz11lKfK4ZiTVBzbG6YwlTYc6osIpcg ZuV9xFrBEZkIb0w3Ul2HM6cXVqK/3QsgR6pXopQBBdc1ajgvvqh8ap+5SkyJNeGJtRaz TFVw== X-Gm-Message-State: AOJu0YznDVS47X3VcP8+iWPYwy9cXr1aMdNXTVXXA4am48icdWtq7p1g dNOdUWC6EGtVIw0uQn1Qb8qCgIhE7zVD1fUhCX044YVK7UXwp/4ARxkaAxtmaU0QVA0Khtl0Iaf wPLbcLkZIxxoKKbKvT6bFxf0anf9ChtXymjdTPPxEvgz5FMJ2mAZG+AWREyG+DGoJ0dpFEyTSeb sBeQ5kofi+t/cYq/184ynJb4kKJpwdMyTsaCyPz4E= X-Received: by 2002:a05:622a:410:b0:42c:5d43:7e77 with SMTP id n16-20020a05622a041000b0042c5d437e77mr6229322qtx.7.1708886414970; Sun, 25 Feb 2024 10:40:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDJTuacgG5XTfOhY7SVD/LqsOnnIcL/vH1iytJzEhh3rFPD2vS6cx41VdsTpXVtB1I8j0wBw== X-Received: by 2002:a05:622a:410:b0:42c:5d43:7e77 with SMTP id n16-20020a05622a041000b0042c5d437e77mr6229303qtx.7.1708886414608; Sun, 25 Feb 2024 10:40:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 10:40:14 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 04/10] dirent: Reformat Makefile. Date: Sun, 25 Feb 2024 13:39:43 -0500 Message-ID: <20240225183956.2534939-4-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=-12.4 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_H4, RCVD_IN_MSPIKE_WL, 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+patchwork=sourceware.org@sourceware.org Reflow and sort Makefile. Code generation changes present due to link order changes. No regressions on x86_64 and i686. --- dirent/Makefile | 52 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/dirent/Makefile b/dirent/Makefile index 92587cab9a..556f759f65 100644 --- a/dirent/Makefile +++ b/dirent/Makefile @@ -22,16 +22,48 @@ subdir := dirent include ../Makeconfig -headers := dirent.h bits/dirent.h bits/dirent_ext.h -routines := opendir closedir readdir readdir_r rewinddir \ - seekdir telldir scandir alphasort versionsort \ - getdents getdents64 dirfd readdir64 readdir64_r scandir64 \ - alphasort64 versionsort64 fdopendir \ - scandirat scandirat64 \ - scandir-cancel scandir-tail scandir64-tail - -tests := list tst-seekdir opendir-tst1 bug-readdir1 tst-fdopendir \ - tst-fdopendir2 tst-scandir tst-scandir64 +headers := \ + bits/dirent.h \ + bits/dirent_ext.h \ + dirent.h \ + # headers +routines := \ + alphasort \ + alphasort64 \ + closedir \ + dirfd \ + fdopendir \ + getdents \ + getdents64 \ + opendir \ + readdir \ + readdir64 \ + readdir64_r \ + readdir_r \ + rewinddir \ + scandir \ + scandir-cancel \ + scandir-tail \ + scandir64 \ + scandir64-tail \ + scandirat \ + scandirat64 \ + seekdir \ + telldir \ + versionsort \ + versionsort64 \ + # routines + +tests := \ + bug-readdir1 \ + list \ + opendir-tst1 \ + tst-fdopendir \ + tst-fdopendir2 \ + tst-scandir \ + tst-scandir64 \ + tst-seekdir \ + # tests CFLAGS-scandir.c += $(uses-callbacks) CFLAGS-scandir64.c += $(uses-callbacks)