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.133.124]) by sourceware.org (Postfix) with ESMTPS id D1C5E3846909 for ; Mon, 20 Feb 2023 13:31:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D1C5E3846909 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=1676899887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l21xRo+/8nl9cUa9QEafEqfotTu13jGjnaeR5zR6oNU=; b=WOemEsmf+/eTLL0LGAmFKWwtUcd/YsWr9OF9BVUKS/mxzlkr5zct4XV0at1fAWq/3waZ0G 4TVJoabSNcMT/4pjH/PDeACpdTVk50NPsIomEI/A/h6mfDygNU0GG5xLIgUlOfN2TbalkY uF6Dm21AkW/wBnzOQRwhf4ydFYT2DwY= Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-131-JaF2Q81kNi2_th7uHZ0DWQ-1; Sun, 19 Feb 2023 16:27:39 -0500 X-MC-Unique: JaF2Q81kNi2_th7uHZ0DWQ-1 Received: by mail-io1-f69.google.com with SMTP id k20-20020a0566022d9400b00734acc87739so615636iow.9 for ; Sun, 19 Feb 2023 13:27:39 -0800 (PST) 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:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l21xRo+/8nl9cUa9QEafEqfotTu13jGjnaeR5zR6oNU=; b=hHQun7xNV5PCkYWJEdIdbPkOhwieXXsnZ47+E2Q3DeJd77KSJnyP3kgMHfUIFdseKN LWslkcmZ62jAWxu4FErjoym6iXHV5WcBvWoXrOPBIoxW4V0TZvV8eL+TvanHso2aJ8rB tTxtTgIxK2WoIyYUzLPaBuMfDEVhLt2/hAjaGu5EbRH/ap4MGab9v5tshdU6mKDnCgu8 okfbGDkDHdQSmwtFhlLseThgC2nHEMpykBBhXcZcvKGyApikK8Zk2EfAxSGbMRcwJnKj ZFjfEcRRCVLAJMbXrT+TOQ1vZmPNLXbiPytdIVlYlv62QJtcLVrvZmlSjasAQqlBalI0 9OOg== X-Gm-Message-State: AO0yUKWV/Bz03ma/1izwMoAZAzr4PvzcIVELbrbXTrlDZIxMn+j407QR omBD1+WkmSYVYpSZZ6JPV06NKQgzzYYy73Q6DFDKrCNA2tO+a9IdG68cdNzD1HB3HulLStxJBax LjltoOyNeYabi6OKTvUKhJISCxw== X-Received: by 2002:a05:6e02:20ef:b0:310:c746:d35d with SMTP id q15-20020a056e0220ef00b00310c746d35dmr38290ilv.25.1676842058192; Sun, 19 Feb 2023 13:27:38 -0800 (PST) X-Google-Smtp-Source: AK7set832456N7D9c48Y5I/AEe1LxdlJP4IrleUxnhr0nLrTlUhs2yRG15LoMnY5Z4E3FAbBiEqvGw== X-Received: by 2002:a05:6e02:20ef:b0:310:c746:d35d with SMTP id q15-20020a056e0220ef00b00310c746d35dmr38282ilv.25.1676842057958; Sun, 19 Feb 2023 13:27:37 -0800 (PST) Received: from [192.168.0.241] ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id q22-20020a02c8d6000000b00375a885f908sm3342590jao.36.2023.02.19.13.27.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Feb 2023 13:27:37 -0800 (PST) Message-ID: <4ae715a4-3f3a-fc08-145e-8a6e2c1a3e3b@redhat.com> Date: Sun, 19 Feb 2023 16:27:36 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH v2 4/5] Linux: Remove unused generic Makefile To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> <20221207212246.2384051-5-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20221207212246.2384051-5-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 12/7/22 16:22, Adhemerval Zanella wrote: > Both are already defined on default linux Makefile. The commit message and the changes are all correct, but two of the hunks were committed as part of the fix for commit c1c0dea38833751f36a145c322ce53c9a08332e1. I tested with: diff --git a/sysdeps/unix/sysv/linux/generic/Makefile b/sysdeps/unix/sysv/linux/generic/Makefile deleted file mode 100644 index 7e27e79772..0000000000 --- a/sysdeps/unix/sysv/linux/generic/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),misc) -sysdep_routines += epoll_create inotify_init -endif The following rb and tb are conditional on this commit dropping those changes. You can therefore carry my rb+tb when you repost v3 and push v3. LGTM. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > sysdeps/unix/sysv/linux/Makefile | 2 ++ > sysdeps/unix/sysv/linux/generic/Makefile | 3 --- > sysdeps/unix/sysv/linux/syscalls.list | 2 -- > 3 files changed, 2 insertions(+), 5 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/generic/Makefile > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index 60e4cb1521..632b49e9ec 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -69,6 +69,8 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \ > clone3 clone-internal \ > fanotify_mark \ > mremap \ > + epoll_create \ > + inotify_init Not needed anymore (commit c1c0dea38833751f36a145c322ce53c9a08332e1) > > CFLAGS-gethostid.c = -fexceptions > CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables > diff --git a/sysdeps/unix/sysv/linux/generic/Makefile b/sysdeps/unix/sysv/linux/generic/Makefile > deleted file mode 100644 > index 7e27e79772..0000000000 > --- a/sysdeps/unix/sysv/linux/generic/Makefile > +++ /dev/null > @@ -1,3 +0,0 @@ > -ifeq ($(subdir),misc) > -sysdep_routines += epoll_create inotify_init > -endif Still needed. > diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list > index b9f45463c5..73e941ef89 100644 > --- a/sysdeps/unix/sysv/linux/syscalls.list > +++ b/sysdeps/unix/sysv/linux/syscalls.list > @@ -6,7 +6,6 @@ capget EXTRA capget i:pp capget > capset EXTRA capset i:pp capset > create_module EXTRA create_module 3 __compat_create_module create_module@GLIBC_2.0:GLIBC_2.23 > delete_module EXTRA delete_module 3 delete_module > -epoll_create EXTRA epoll_create i:i epoll_create > epoll_create1 EXTRA epoll_create1 i:i epoll_create1 > epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl > eventfd EXTRA eventfd2 i:ii eventfd > @@ -28,7 +27,6 @@ getresgid - getresgid i:ppp getresgid > getsid - getsid i:i getsid > init_module EXTRA init_module 5 init_module > inotify_add_watch EXTRA inotify_add_watch i:isi inotify_add_watch > -inotify_init EXTRA inotify_init i: inotify_init > inotify_init1 EXTRA inotify_init1 i:I inotify_init1 > inotify_rm_watch EXTRA inotify_rm_watch i:ii inotify_rm_watch > ioperm - ioperm i:UUi ioperm Not needed anymore (commit c1c0dea38833751f36a145c322ce53c9a08332e1). -- Cheers, Carlos.