diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules | 14 | ||||
| -rw-r--r-- | sysdeps/unix/make-syscalls.sh | 4 |
3 files changed, 8 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index d9c07ff7e9..caa476e7f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-05-21 David S. Miller <davem@davemloft.net> + + * Makefules (o-iterator): Remove .s cases. + (compile-command.s): Delete. + (COMPILE.s): Delete. + * sysdeps/unix/make-syscalls.sh: Remove .s file tests. + 2012-05-21 Joseph Myers <joseph@codesourcery.com> * configure.in (libc_cv_predef_stack_protector): Only consider diff --git a/Makerules b/Makerules index bce427d0a2..0fd1b5b3e3 100644 --- a/Makerules +++ b/Makerules @@ -275,12 +275,6 @@ object-suffixes-left := $(all-object-suffixes) include $(o-iterator) define o-iterator-doit -$(objpfx)%$o: %.s $(before-compile); $$(compile-command.s) -endef -object-suffixes-left := $(all-object-suffixes) -include $(o-iterator) - -define o-iterator-doit $(objpfx)%$o: %.c $(before-compile); $$(compile-command.c) endef object-suffixes-left := $(all-object-suffixes) @@ -304,12 +298,6 @@ object-suffixes-left := $(all-object-suffixes) include $(o-iterator) define o-iterator-doit -$(objpfx)%$o: $(objpfx)%.s $(before-compile); $$(compile-command.s) -endef -object-suffixes-left := $(all-object-suffixes) -include $(o-iterator) - -define o-iterator-doit $(objpfx)%$o: $(objpfx)%.c $(before-compile); $$(compile-command.c) endef object-suffixes-left := $(all-object-suffixes) @@ -365,7 +353,6 @@ endif # sysd-sorted-done # Generate .dT files as we compile. compile-mkdep-flags = -MD -MP -MF $@.dt -MT $@ compile-command.S = $(compile.S) $(OUTPUT_OPTION) $(compile-mkdep-flags) -compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags) compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags) compile-command.cc = $(compile.cc) $(OUTPUT_OPTION) $(compile-mkdep-flags) @@ -381,7 +368,6 @@ compile.S = $(CC) $< -c $(CPPFLAGS) $(S-CPPFLAGS) \ $(ASFLAGS) $(ASFLAGS-$(suffix $@)) COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) \ $(ASFLAGS) $(ASFLAGS-$(suffix $@)) -COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS) # We need this for the output to go in the right place. It will default to # empty if make was configured to work with a cc that can't grok -c and -o diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index ff452d6780..48aab629f5 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -54,11 +54,9 @@ while read file caller rest; do for dir in $sysdirs; do { test -f $dir/$file.c && srcfile=$dir/$file.c; } || { test -f $dir/$file.S && srcfile=$dir/$file.S; } || - { test -f $dir/$file.s && srcfile=$dir/$file.s; } || { test x$caller != x- && { { test -f $dir/$caller.c && srcfile=$dir/$caller.c; } || - { test -f $dir/$caller.S && srcfile=$dir/$caller.S; } || - { test -f $dir/$caller.s && srcfile=$dir/$caller.s; }; }; } && break; + { test -f $dir/$caller.S && srcfile=$dir/$caller.S; }; }; } && break; done; echo $file $srcfile $caller $rest; done` |