| Message ID | 20221207212246.2384051-5-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Remove Linux generic sysdep | expand |
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 <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com> > --- > 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).
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 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 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