[PATCH v3] Remove the unused +mkdep/+make-deps/s-proto.S/s-proto-cancel.S

[PATCH v3] Remove the unused +mkdep/+make-deps/s-proto.S/s-proto-cancel.S

[H.J. Lu]

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
+mkdep, +make-deps, s-proto.S and s-proto-cancel.S.
---
 Makeconfig                    | 7 -------
 Makerules                     | 9 ---------
 sysdeps/unix/Makefile         | 4 ----
 sysdeps/unix/s-proto-cancel.S | 5 -----
 sysdeps/unix/s-proto.S        | 4 ----
 5 files changed, 29 deletions(-)
 delete mode 100644 sysdeps/unix/s-proto-cancel.S
 delete mode 100644 sysdeps/unix/s-proto.S

diff --git a/Makeconfig b/Makeconfig
index 2fa0884b4e..3fa2f13003 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -873,13 +873,6 @@ define elide-stack-protector
 $(if $(filter $(@F),$(patsubst %,%$(1),$(2))), $(no-stack-protector))
 endef
 
-# This is the program that generates makefile dependencies from C source files.
-# The -MP flag tells GCC >= 3.2 (which we now require) to produce dummy
-# targets for headers so that removed headers don't break the build.
-ifndef +mkdep
-+mkdep = $(CC) -M -MP
-endif
-
 # The program that makes Emacs-style TAGS files.
 ETAGS	:= etags
 
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/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>
-- 
2.33.1

Re: [PATCH v3] Remove the unused +mkdep/+make-deps/s-proto.S/s-proto-cancel.S

[Andreas Schwab]

On Nov 09 2021, H.J. Lu via Libc-alpha wrote:

> 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
> +mkdep, +make-deps, s-proto.S and s-proto-cancel.S.

Ok.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."