diff mbox series

Remove the unnecessary +make-deps

Message ID 20211106135053.141779-1-hjl.tools@gmail.com
State Superseded
Headers show
Series Remove the unnecessary +make-deps | 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. 6, 2021, 1:50 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
+make-deps which is no longer unnecessary.
---
 Makerules             | 9 ---------
 sysdeps/unix/Makefile | 4 ----
 2 files changed, 13 deletions(-)

Comments

Andreas Schwab Nov. 8, 2021, 4:01 p.m. UTC | #1
On Nov 06 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/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))

This was the last reference to sysdeps/unix/s-proto.S and
sysdeps/unix/s-proto-cancel.S.

Andreas.
H.J. Lu Nov. 8, 2021, 4:12 p.m. UTC | #2
On Mon, Nov 8, 2021 at 8:01 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> On Nov 06 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/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))
>
> This was the last reference to sysdeps/unix/s-proto.S and
> sysdeps/unix/s-proto-cancel.S.
>
> Andreas.

Is this an approval?
H.J. Lu Nov. 8, 2021, 6:42 p.m. UTC | #3
On Mon, Nov 8, 2021 at 8:01 AM Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> On Nov 06 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/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))
>
> This was the last reference to sysdeps/unix/s-proto.S and
> sysdeps/unix/s-proto-cancel.S.
>
> Andreas.
>

The v2 patch is at

https://sourceware.org/pipermail/libc-alpha/2021-November/132816.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/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