From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 8B30D3857733 for ; Tue, 16 May 2023 12:48:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B30D3857733 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684241315; 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=G2kId7pMPuaupkbZyk1Agu1gQtayOCmzT1em2mag0OQ=; b=RcCYuHAihcw98q8ZpSwIDb2itlOAw5vcfVk89xsqLYIsXQuu8MXWCcEmKyDqGlJ7NiWuHe 2kgPQETnVlmET7iIsUSs//1IXg0ZRwsv2oroCUx4aig5wQJ+8fp5ZPE4mrcSl+/9iJU0h1 oMrCLOHIqfC1X3s36Y6tsEyxaIqeMkA= 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-665-7pZ8Lg0dOSS2c4RTk0mxHw-1; Tue, 16 May 2023 08:48:34 -0400 X-MC-Unique: 7pZ8Lg0dOSS2c4RTk0mxHw-1 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-ba712bb7b28so4902956276.1 for ; Tue, 16 May 2023 05:48:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684241313; x=1686833313; 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=G2kId7pMPuaupkbZyk1Agu1gQtayOCmzT1em2mag0OQ=; b=IvAKpr0dBl7LeOYO20+ujZBCBxAHovd+97JMJRxCy/eh/jIMhh9bzxap7odi9Bh037 PpFwEJStGgIqNPTcvBb49Th/m75JjHbbugoOmGdExOWg42hBZS58WzYGGYQKUaLgY7Oi g3HP0dig4XxggrOz63l5ZmxKiQ7n30YndM85KkqZuMcYGt4RYnRS6u2hyioEpTSI39fN a6Xr/lXJFokKjatN9hpAlpGErW1j5dIfUZYICGDImUGL0Xg8RDBxsZggc9NDzsvsYh38 ImTCorHnLvHiOFNllDLrvnZ28FJk84DP/nutwJsXSMq1V7GN8H7VesmoMSkIuKOIUByf ngqg== X-Gm-Message-State: AC+VfDzBGzQJviOcDi8H4XcFn6XRBavsDHEepeMx48mmRhrPjfJ+YXx0 dS6CV7jpTHB1tdY+ry9Ow5BecH59QT0DI44tiU9EQ2YRr1g+JJmsNFY8Rh6paXAC/5tWLuBQwhV lwozCk2K6kHQ1iKt+ApTMVnQZkEo1mwVi7Xs8V10OgQWn8u8Hh41caauiQ45pughXKuonkMVJY1 Fn+w== X-Received: by 2002:a81:1304:0:b0:561:a41f:be78 with SMTP id 4-20020a811304000000b00561a41fbe78mr730107ywt.3.1684241313076; Tue, 16 May 2023 05:48:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mic5NRQfH4PTmmA2VXzVLwebop4fMEJSIQLM8i7rKv3rYwVtM9+mxvGLN4Zm5PPRJL5XI1Q== X-Received: by 2002:a81:1304:0:b0:561:a41f:be78 with SMTP id 4-20020a811304000000b00561a41fbe78mr730093ywt.3.1684241312731; Tue, 16 May 2023 05:48:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 05:48:31 -0700 (PDT) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED 3/8] misc: Reformat Makefile. Date: Tue, 16 May 2023 08:48:19 -0400 Message-Id: <20230516124824.146416-4-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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,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 List-Id: 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. --- misc/Makefile | 299 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 232 insertions(+), 67 deletions(-) diff --git a/misc/Makefile b/misc/Makefile index 9f42321206..1a21347f5e 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -23,79 +23,240 @@ subdir := misc include ../Makeconfig -headers := sys/uio.h bits/uio-ext.h bits/uio_lim.h \ - sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ - sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \ - ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \ - ttyent.h paths.h sys/reboot.h \ - sys/mman.h sys/param.h bits/param.h \ - fstab.h mntent.h search.h err.h error.h \ - sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \ - sys/select.h sys/sysinfo.h \ - regexp.h bits/select.h bits/mman.h sys/xattr.h \ - syslog.h sys/syslog.h \ - bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \ - bits/select2.h bits/hwcap.h sys/auxv.h \ - sys/sysmacros.h bits/sysmacros.h bits/types/struct_iovec.h \ - bits/err-ldbl.h bits/error-ldbl.h \ - sys/single_threaded.h - -routines := brk sbrk sstk ioctl \ - readv writev preadv preadv64 pwritev pwritev64 \ - preadv2 preadv64v2 pwritev2 pwritev64v2 \ - setreuid setregid \ - seteuid setegid \ - getpagesize \ - getdtsz \ - gethostname sethostname getdomain setdomain \ - select pselect \ - acct chroot fsync sync fdatasync syncfs reboot \ - gethostid sethostid \ - revoke vhangup \ - swapon swapoff mktemp mkstemp mkstemp64 mkdtemp \ - mkostemp mkostemp64 mkstemps mkstemps64 mkostemps mkostemps64 \ - ualarm usleep \ - gtty stty \ - ptrace \ - fstab mntent mntent_r \ - utimes lutimes futimes futimesat \ - truncate ftruncate truncate64 ftruncate64 \ - chflags fchflags \ - insremque getttyent getusershell getpass ttyslot \ - syslog syscall daemon \ - mmap mmap64 munmap mprotect msync madvise mincore remap_file_pages\ - mlock munlock mlockall munlockall \ - efgcvt efgcvt_r qefgcvt qefgcvt_r \ - hsearch hsearch_r tsearch lsearch \ - err error ustat \ - getsysstats dirname regexp \ - getloadavg getclktck \ - fgetxattr flistxattr fremovexattr fsetxattr getxattr \ - listxattr lgetxattr llistxattr lremovexattr lsetxattr \ - removexattr setxattr getauxval ifunc-impl-list makedev \ - allocate_once fd_to_filename single_threaded unwind-link \ - atomic_wide_counter - -generated += tst-error1.mtrace tst-error1-mem.out \ - tst-allocate_once.mtrace tst-allocate_once-mem.out +headers := \ + sys/uio.h \ + bits/uio-ext.h \ + bits/uio_lim.h \ + sys/ioctl.h \ + bits/ioctls.h \ + bits/ioctl-types.h \ + sys/ptrace.h \ + sys/file.h \ + sys/dir.h \ + sys/cdefs.h \ + ar.h \ + a.out.h \ + libgen.h \ + stab.h \ + bits/stab.def \ + sgtty.h \ + ttyent.h \ + paths.h \ + sys/reboot.h \ + sys/mman.h \ + sys/param.h \ + bits/param.h \ + fstab.h \ + mntent.h \ + search.h \ + err.h \ + error.h \ + sys/queue.h \ + sysexits.h \ + syscall.h \ + sys/syscall.h \ + sys/swap.h \ + sys/select.h \ + sys/sysinfo.h \ + regexp.h \ + bits/select.h \ + bits/mman.h \ + sys/xattr.h \ + syslog.h \ + sys/syslog.h \ + bits/syslog.h \ + bits/syslog-ldbl.h \ + bits/syslog-path.h \ + bits/error.h \ + bits/select2.h \ + bits/hwcap.h \ + sys/auxv.h \ + sys/sysmacros.h \ + bits/sysmacros.h \ + bits/types/struct_iovec.h \ + bits/err-ldbl.h \ + bits/error-ldbl.h \ + sys/single_threaded.h \ + # headers + +routines := \ + acct \ + allocate_once \ + atomic_wide_counter \ + brk \ + chflags \ + chroot \ + daemon \ + dirname \ + efgcvt \ + efgcvt_r \ + err \ + error \ + fchflags \ + fd_to_filename \ + fdatasync \ + fgetxattr \ + flistxattr \ + fremovexattr \ + fsetxattr \ + fstab \ + fsync \ + ftruncate \ + ftruncate64 \ + futimes \ + futimesat \ + getauxval \ + getclktck \ + getdomain \ + getdtsz \ + gethostid \ + gethostname \ + getloadavg \ + getpagesize \ + getpass \ + getsysstats \ + getttyent \ + getusershell \ + getxattr \ + gtty \ + hsearch \ + hsearch_r \ + ifunc-impl-list \ + insremque \ + ioctl \ + lgetxattr \ + listxattr \ + llistxattr \ + lremovexattr \ + lsearch \ + lsetxattr \ + lutimes \ + madvise \ + makedev \ + mincore \ + mkdtemp \ + mkostemp \ + mkostemp64 \ + mkostemps \ + mkostemps64 \ + mkstemp \ + mkstemp64 \ + mkstemps \ + mkstemps64 \ + mktemp \ + mlock \ + mlockall \ + mmap \ + mmap64 \ + mntent \ + mntent_r \ + mprotect \ + msync \ + munlock \ + munlockall \ + munmap \ + preadv \ + preadv64 \ + preadv2 \ + preadv64v2 \ + pselect \ + ptrace \ + pwritev \ + pwritev64 \ + pwritev2 \ + pwritev64v2 \ + qefgcvt \ + qefgcvt_r \ + readv \ + reboot \ + regexp \ + remap_file_pages \ + removexattr \ + revoke \ + sbrk \ + select \ + setdomain \ + setegid \ + seteuid \ + sethostid \ + sethostname \ + setregid \ + setreuid \ + setxattr \ + single_threaded \ + sstk \ + stty \ + swapoff \ + swapon \ + sync \ + syncfs \ + syscall \ + syslog \ + truncate \ + truncate64 \ + tsearch \ + ttyslot \ + ualarm \ + unwind-link \ + usleep \ + ustat \ + utimes \ + vhangup \ + writev \ + # routines + +generated += \ + tst-allocate_once-mem.out \ + tst-allocate_once.mtrace \ + tst-error1-mem.out \ + tst-error1.mtrace \ + # generated aux := init-misc install-lib := libg.a -gpl2lgpl := error.c error.h -tests := tst-dirname tst-tsearch tst-fdset tst-mntent tst-hsearch \ - tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ - tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ - tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \ - tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \ - tst-ldbl-warn tst-ldbl-error tst-dbl-efgcvt tst-ldbl-efgcvt \ - tst-mntent-autofs tst-syscalls tst-mntent-escape tst-select \ - tst-ioctl tst-ldbl-errorfptr +gpl2lgpl := \ + error.c \ + error.h \ + # gpl2lgpl + +tests := \ + bug-hsearch1 \ + bug18240 \ + tst-dbl-efgcvt \ + tst-dirname \ + tst-empty \ + tst-error1 \ + tst-fdset \ + tst-hsearch \ + tst-insremque \ + tst-ioctl \ + tst-ldbl-efgcvt \ + tst-ldbl-error \ + tst-ldbl-errorfptr \ + tst-ldbl-warn \ + tst-makedev \ + tst-mntent \ + tst-mntent-autofs \ + tst-mntent-blank-corrupt \ + tst-mntent-blank-passno \ + tst-mntent-escape \ + tst-mntent2 \ + tst-preadvwritev \ + tst-preadvwritev64 \ + tst-preadvwritev2 \ + tst-preadvwritev64v2 \ + tst-pselect \ + tst-select \ + tst-syscalls \ + tst-tsearch \ + tst-warn-wide \ + # tests tests-time64 := \ - tst-select-time64 \ - tst-pselect-time64 \ tst-ioctl-time64 \ + tst-pselect-time64 \ + tst-select-time64 \ # tests-time64 # Tests which need libdl. @@ -103,7 +264,11 @@ ifeq (yes,$(build-shared)) tests += tst-gethostid endif -tests-internal := tst-atomic tst-atomic-long tst-allocate_once +tests-internal := \ + tst-allocate_once \ + tst-atomic \ + tst-atomic-long \ + # tests-internal tests-static := tst-empty # Test for the internal, non-exported __fd_to_filename function. -- 2.40.0