From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 148113858D1E for ; Mon, 19 Dec 2022 12:17:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 148113858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-x32d.google.com with SMTP id q18-20020a056830441200b006704633f258so5241881otv.0 for ; Mon, 19 Dec 2022 04:17:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=S/0EnDDv8f1zvAGVMyLTBX8JrO1suFoF50xqHBJODc4=; b=b6EESsNrNfCccJRDf5fWe5NsZDiK+7jnFs4wAdkXSUu2aBfs/+pi7V0jGOzoaLDB09 F0kkmisZUZFv2y5JYJ29eZsEXdQix3Nhm2KiG3Syyn2eFb+nYQ1TpJY3mp6Szn6W7miG 0S5qrLEc92pQgctyAmGqbhwoTFRY1IB6ZbKihqVeFud0u//ROgu7mPFALksc1ZgOiM7N hiKI9FKFPhFf6mDXR9j4jMK7Q7vu7JfV+XZ9vhfe0ur3Hx2bVDmRtIGp3UIVfvxAmcOS VX3k1NuULwVjX2DwHHXMQfuJs94qMsLRUt3DPDuQnXoF5ChJkJETAyjSrdB+vAfHmcOI f3SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S/0EnDDv8f1zvAGVMyLTBX8JrO1suFoF50xqHBJODc4=; b=eBGasLc4Vwe+m/O9ZeyQbQchZzfjO4p4FQLCmCjIkISe50aEwfYQpQug4Ua5w8Tskj vy7xQjaK/Pyy1yfVTJj+ZlxodtPY+cEB9w7ErCfbW+G5bBl4tcfMbwI+9VIzCMhT/8/b Li9XNBzAAz/9WyOIBHWpIIJA9tVwjHjHZhePDxRQSw9q8xmk/dtDIFaVSSvWRZSLZ6Fv HV9BCitcAz3aMa8N86qCuM5e7rHgN076R4PWKm6s2RZ3eAwp1ejh9mXWC+7KGfLJ8lcy 56whi1GMNNRRCESvogw6lSOpk1mrboeuI/UePuuIFncn+5K3D2g/mqkp0EhC/xsdKKfS RTUw== X-Gm-Message-State: ANoB5pmyjcMW1NYgOToIb6vsPoRg7Ps2z5lBD/1eNvsY1wKV4ONLJ7Ih 2f5JS03o97krMJi4NSqpRZIfA8dWKgxKKMIhYbc= X-Google-Smtp-Source: AA0mqf4brqexyQoT7FBY93rsXqLB4yigtPmVXdItF1gXEODgETCFv32LYA1bSEj4gkHsGpqE5MpUvQ== X-Received: by 2002:a05:6830:3685:b0:661:dfeb:ea33 with SMTP id bk5-20020a056830368500b00661dfebea33mr22006527otb.24.1671452233262; Mon, 19 Dec 2022 04:17:13 -0800 (PST) Received: from [192.168.15.31] ([177.103.116.22]) by smtp.gmail.com with ESMTPSA id w20-20020a9d6754000000b006708d2cd8bcsm4293570otm.65.2022.12.19.04.17.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Dec 2022 04:17:12 -0800 (PST) Message-ID: <173b271b-3e7d-6561-be58-410e14778060@linaro.org> Date: Mon, 19 Dec 2022 09:15:54 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH 1/2] Linux: Reflow and sort some Makefile variables To: Florian Weimer , libc-alpha@sourceware.org Cc: Carlos O'Donell References: Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP 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: LGTM, thanks. Reviewed-by: Adhemerval Zanella On 19/12/22 09:03, Florian Weimer wrote: > --- > sysdeps/unix/sysv/linux/Makefile | 218 ++++++++++++++++++++++--------- > 1 file changed, 155 insertions(+), 63 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index 60e4cb1521..42e51625ab 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -54,21 +54,57 @@ CFLAGS-malloc.c += -DMORECORE_CLEARS=2 > endif > > ifeq ($(subdir),misc) > -sysdep_routines += adjtimex clone umount umount2 readahead sysctl \ > - setfsuid setfsgid epoll_pwait epoll_pwait2 signalfd \ > - eventfd eventfd_read eventfd_write prlimit prlimit64 \ > - personality epoll_wait tee vmsplice splice \ > - open_by_handle_at mlock2 pkey_mprotect pkey_set pkey_get \ > - timerfd_gettime timerfd_settime prctl \ > - process_vm_readv process_vm_writev clock_adjtime \ > - pselect32 \ > - xstat fxstat lxstat xstat64 fxstat64 lxstat64 \ > - fxstatat fxstatat64 \ > - xmknod xmknodat convert_scm_timestamps \ > - closefrom_fallback \ > - clone3 clone-internal \ > - fanotify_mark \ > - mremap \ > +sysdep_routines += \ > + adjtimex \ > + clock_adjtime \ > + clone \ > + clone-internal \ > + clone3 \ > + closefrom_fallback \ > + convert_scm_timestamps \ > + epoll_pwait \ > + epoll_pwait2 \ > + epoll_wait \ > + eventfd \ > + eventfd_read \ > + eventfd_write \ > + fanotify_mark \ > + fxstat \ > + fxstat64 \ > + fxstatat \ > + fxstatat64 \ > + lxstat \ > + lxstat64 \ > + mlock2 \ > + mremap \ > + open_by_handle_at \ > + personality \ > + pkey_get \ > + pkey_mprotect \ > + pkey_set \ > + prctl \ > + prlimit \ > + prlimit64 \ > + process_vm_readv \ > + process_vm_writev \ > + pselect32 \ > + readahead \ > + setfsgid \ > + setfsuid \ > + signalfd \ > + splice \ > + sysctl \ > + tee \ > + timerfd_gettime \ > + timerfd_settime \ > + umount \ > + umount2 \ > + vmsplice \ > + xmknod \ > + xmknodat \ > + xstat \ > + xstat64 \ > + # sysdeps-routines > > CFLAGS-gethostid.c = -fexceptions > CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables > @@ -79,58 +115,114 @@ CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables > CFLAGS-pselect32.c = -fexceptions -fasynchronous-unwind-tables > CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" > > -sysdep_headers += sys/mount.h sys/acct.h \ > - sys/klog.h \ > - sys/user.h sys/prctl.h \ > - sys/kd.h sys/soundcard.h sys/vt.h \ > - sys/quota.h sys/fsuid.h \ > - scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \ > - sys/raw.h sys/personality.h sys/epoll.h \ > - bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h \ > - sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \ > - bits/signalfd.h bits/timerfd.h bits/epoll.h \ > - bits/socket_type.h bits/syscall.h \ > - bits/mman-linux.h bits/mman-shared.h bits/ptrace-shared.h \ > - bits/siginfo-arch.h bits/siginfo-consts-arch.h \ > - bits/procfs.h bits/procfs-id.h bits/procfs-extra.h \ > - bits/procfs-prregset.h bits/mman-map-flags-generic.h \ > - bits/shmlba.h \ > - bits/termios-struct.h bits/termios-c_cc.h \ > - bits/termios-c_iflag.h bits/termios-c_oflag.h \ > - bits/termios-baud.h bits/termios-c_cflag.h \ > - bits/termios-c_lflag.h bits/termios-tcflow.h \ > - bits/termios-misc.h \ > - bits/types/struct_semid_ds.h \ > - bits/types/struct_msqid_ds.h \ > - bits/types/struct_shmid_ds.h \ > - bits/ipc-perm.h \ > - bits/struct_stat.h \ > - bits/struct_stat_time64_helper.h \ > - bits/types/struct_msqid64_ds.h \ > - bits/types/struct_msqid64_ds_helper.h \ > - bits/types/struct_semid64_ds.h \ > - bits/types/struct_semid64_ds_helper.h \ > - bits/types/struct_shmid64_ds.h \ > - bits/types/struct_shmid64_ds_helper.h \ > - bits/pthread_stack_min.h bits/pthread_stack_min-dynamic.h \ > - sys/rseq.h bits/rseq.h \ > - sys/pidfd.h > - > -tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ > - tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ > - test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \ > - tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ > - tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ > - tst-timerfd tst-ppoll \ > - tst-clock_adjtime tst-adjtimex tst-ntp_adjtime tst-ntp_gettime \ > - tst-ntp_gettimex tst-sigtimedwait tst-misalign-clone \ > - tst-prctl \ > - tst-scm_rights \ > +sysdep_headers += \ > + bits/a.out.h \ > + bits/epoll.h \ > + bits/eventfd.h \ > + bits/inotify.h \ > + bits/ipc-perm.h \ > + bits/mman-linux.h \ > + bits/mman-map-flags-generic.h \ > + bits/mman-shared.h \ > + bits/procfs-extra.h \ > + bits/procfs-id.h \ > + bits/procfs-prregset.h \ > + bits/procfs.h \ > + bits/pthread_stack_min-dynamic.h \ > + bits/pthread_stack_min.h \ > + bits/ptrace-shared.h \ > + bits/rseq.h \ > + bits/shmlba.h \ > + bits/siginfo-arch.h \ > + bits/siginfo-consts-arch.h \ > + bits/signalfd.h \ > + bits/socket_type.h \ > + bits/struct_stat.h \ > + bits/struct_stat_time64_helper.h \ > + bits/syscall.h \ > + bits/termios-baud.h \ > + bits/termios-c_cc.h \ > + bits/termios-c_cflag.h \ > + bits/termios-c_iflag.h \ > + bits/termios-c_lflag.h \ > + bits/termios-c_oflag.h \ > + bits/termios-misc.h \ > + bits/termios-struct.h \ > + bits/termios-tcflow.h \ > + bits/timerfd.h \ > + bits/types/struct_msqid64_ds.h \ > + bits/types/struct_msqid64_ds_helper.h \ > + bits/types/struct_msqid_ds.h \ > + bits/types/struct_semid64_ds.h \ > + bits/types/struct_semid64_ds_helper.h \ > + bits/types/struct_semid_ds.h \ > + bits/types/struct_shmid64_ds.h \ > + bits/types/struct_shmid64_ds_helper.h \ > + bits/types/struct_shmid_ds.h \ > + scsi/scsi.h \ > + scsi/scsi_ioctl.h \ > + scsi/sg.h \ > + sys/acct.h \ > + sys/epoll.h \ > + sys/eventfd.h \ > + sys/fanotify.h \ > + sys/fsuid.h \ > + sys/inotify.h \ > + sys/kd.h \ > + sys/klog.h \ > + sys/mount.h \ > + sys/pci.h \ > + sys/personality.h \ > + sys/pidfd.h \ > + sys/prctl.h \ > + sys/quota.h \ > + sys/raw.h \ > + sys/rseq.h \ > + sys/signalfd.h \ > + sys/soundcard.h \ > + sys/timerfd.h \ > + sys/user.h \ > + sys/vt.h \ > + # sysdep-headers > + > +tests += \ > + test-errno-linux \ > + tst-adjtimex \ > + tst-clock_adjtime \ > + tst-clone \ > + tst-clone2 \ > + tst-clone3 \ > tst-epoll \ > + tst-fanotify \ > tst-getauxval \ > + tst-gettid \ > + tst-gettid-kill \ > + tst-memfd_create \ > + tst-misalign-clone \ > + tst-mlock2 \ > + tst-mount \ > + tst-ntp_adjtime \ > + tst-ntp_gettime \ > + tst-ntp_gettimex \ > + tst-ofdlocks \ > + tst-personality \ > tst-pidfd \ > + tst-pkey \ > + tst-ppoll \ > + tst-prctl \ > tst-process_mrelease \ > - tst-mount \ > + tst-quota \ > + tst-rlimit-infinity \ > + tst-scm_rights \ > + tst-sigtimedwait \ > + tst-sync_file_range \ > + tst-sysconf-iov_max \ > + tst-sysvmsg-linux \ > + tst-sysvsem-linux \ > + tst-sysvshm-linux \ > + tst-tgkill \ > + tst-timerfd \ > + tst-ttyname \ > # tests > > # process_madvise requires CAP_SYS_ADMIN.