diff mbox series

[v2] Remove the unused +make-deps/s-proto.S/s-proto-cancel.S

Message ID 20211108184153.2137212-1-hjl.tools@gmail.com
State Committed
Headers show
Series [v2] Remove the unused +make-deps/s-proto.S/s-proto-cancel.S | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

H.J. Lu Nov. 8, 2021, 6:41 p.m. UTC
Since

commit d73f5331ce5370ca5a879229e3842f5de98689cd
Author: Roland McGrath <roland@gnu.org>
Date:   Fri May 2 02:20:45 2003 +0000

    2003-05-01  Roland McGrath  <roland@redhat.com>

dependency is generated by passing -MD -MF to compiler.  Remove the unused
+make-deps, s-proto.S and s-proto-cancel.S.
---
 Makerules                                      | 9 ---------
 benchtests/strcoll-inputs/filelist#en_US.UTF-8 | 2 --
 sysdeps/unix/Makefile                          | 4 ----
 sysdeps/unix/s-proto-cancel.S                  | 5 -----
 sysdeps/unix/s-proto.S                         | 4 ----
 5 files changed, 24 deletions(-)
 delete mode 100644 sysdeps/unix/s-proto-cancel.S
 delete mode 100644 sysdeps/unix/s-proto.S

Comments

Andreas Schwab Nov. 9, 2021, 11:06 a.m. UTC | #1
On Nov 08 2021, H.J. Lu via Libc-alpha wrote:

> diff --git a/Makerules b/Makerules
> index 3503605a8e..8db0ca1296 100644
> --- a/Makerules
> +++ b/Makerules
> @@ -459,15 +459,6 @@ compile-stdin.c = $(COMPILE.c) -o $@ -x c - $(compile-mkdep-flags)
>  # get the wrong predefines.
>  S-CPPFLAGS = -DASSEMBLER $(asm-CPPFLAGS)
>  
> -define +make-deps
> -$(make-target-directory)
> -$(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \

This was the last use of +mkdep.

> diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
> index 197700ec90..c62cad2042 100644
> --- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
> +++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
> @@ -393,7 +393,6 @@ dbl2mpn.c
>  mrand48.c
>  sysdeps
>  unix
> -s-proto-cancel.S
>  getlogin.c
>  clock_nanosleep.c
>  sockatmark.c
> @@ -474,7 +473,6 @@ cmsg_nxthdr.c
>  wait3.c
>  gtty.c
>  tcsetpgrp.c
> -s-proto.S
>  sysv
>  linux
>  check-cpuset.h

Whatfor?

Andreas.
H.J. Lu Nov. 9, 2021, 7:38 p.m. UTC | #2
On Tue, Nov 9, 2021 at 3:06 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> On Nov 08 2021, H.J. Lu via Libc-alpha wrote:
>
> > diff --git a/Makerules b/Makerules
> > index 3503605a8e..8db0ca1296 100644
> > --- a/Makerules
> > +++ b/Makerules
> > @@ -459,15 +459,6 @@ compile-stdin.c = $(COMPILE.c) -o $@ -x c - $(compile-mkdep-flags)
> >  # get the wrong predefines.
> >  S-CPPFLAGS = -DASSEMBLER $(asm-CPPFLAGS)
> >
> > -define +make-deps
> > -$(make-target-directory)
> > -$(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \
>
> This was the last use of +mkdep.

Removed.

> > diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
> > index 197700ec90..c62cad2042 100644
> > --- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
> > +++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
> > @@ -393,7 +393,6 @@ dbl2mpn.c
> >  mrand48.c
> >  sysdeps
> >  unix
> > -s-proto-cancel.S
> >  getlogin.c
> >  clock_nanosleep.c
> >  sockatmark.c
> > @@ -474,7 +473,6 @@ cmsg_nxthdr.c
> >  wait3.c
> >  gtty.c
> >  tcsetpgrp.c
> > -s-proto.S
> >  sysv
> >  linux
> >  check-cpuset.h
>
> Whatfor?
>

Excluded.

Here is the v3 patch:

https://sourceware.org/pipermail/libc-alpha/2021-November/132886.html
diff mbox series

Patch

diff --git a/Makerules b/Makerules
index 3503605a8e..8db0ca1296 100644
--- a/Makerules
+++ b/Makerules
@@ -459,15 +459,6 @@  compile-stdin.c = $(COMPILE.c) -o $@ -x c - $(compile-mkdep-flags)
 # get the wrong predefines.
 S-CPPFLAGS = -DASSEMBLER $(asm-CPPFLAGS)
 
-define +make-deps
-$(make-target-directory)
-$(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \
-	     $(CPPFLAGS) $($(patsubst .%,%,$(suffix $(<F)))-CPPFLAGS) | sed -e\
-'s,$(subst .,\.,$(@F:.d=.o)),$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \
-$(sed-remove-objpfx) $(sed-remove-dotdot) > $(@:.d=.T)
-mv -f $(@:.d=.T) $@
-endef
-
 ifneq (,$(objpfx))
 # Continuation lines here are dangerous because they introduce spaces!
 define sed-remove-objpfx
diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
index 197700ec90..c62cad2042 100644
--- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
+++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
@@ -393,7 +393,6 @@  dbl2mpn.c
 mrand48.c
 sysdeps
 unix
-s-proto-cancel.S
 getlogin.c
 clock_nanosleep.c
 sockatmark.c
@@ -474,7 +473,6 @@  cmsg_nxthdr.c
 wait3.c
 gtty.c
 tcsetpgrp.c
-s-proto.S
 sysv
 linux
 check-cpuset.h
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index 2ee3be7237..582baa4bd8 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -104,10 +104,6 @@  $(common-objpfx)sysd-syscalls: $(..)sysdeps/unix/make-syscalls.sh \
 	mv -f $@T $@
 endif
 
-$(common-objpfx)s-%.d: $(..)sysdeps/unix/s-%.S \
-		       $(wildcard $(+sysdep_dirs:%=%/syscalls.list))
-	$(+make-deps)
-
 postclean-generated += sysd-syscalls
 
 endif
diff --git a/sysdeps/unix/s-proto-cancel.S b/sysdeps/unix/s-proto-cancel.S
deleted file mode 100644
index 042be3c8df..0000000000
--- a/sysdeps/unix/s-proto-cancel.S
+++ /dev/null
@@ -1,5 +0,0 @@ 
-/* This file exists just to have its dependencies determined.
-   Those dependencies are then used for the objects of the cancellable
-   system calls.  */
-
-#include <sysdep-cancel.h>
diff --git a/sysdeps/unix/s-proto.S b/sysdeps/unix/s-proto.S
deleted file mode 100644
index 52a197036c..0000000000
--- a/sysdeps/unix/s-proto.S
+++ /dev/null
@@ -1,4 +0,0 @@ 
-/* This file exists just to have its dependencies determined.
-   Those dependencies are then used for the simple system call objects.  */
-
-#include <sysdep.h>