Work around shortest-stem feature in make 3.82+

diff --git a/ChangeLog b/ChangeLog
index 4576e651d4a947b75d025791992ffec671fa1f87..ff36898cc202ce2c883bfeb32cf60d952b2ad64d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-13  Andreas Schwab  <schwab@redhat.com>
+
+       * Makeconfig (sysd-rules-patterns): Add rtld-%:rtld-%.
+       (sysd-rules-targets): Remove duplicates.
+       * elf/rtld-Rules ($(objpfx)rtld-%.os): Add pattern rules with
+       rtld-%.$o dependency.
+
 2010-09-08  Chung-Lin Tang  <cltang@codesourcery.com>
            Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/Makeconfig b/Makeconfig
index 97789987386f14c9f8208b13a726febe9d7e125b..807c1d17e9658b97cde6e03e8e2f7a3db0837603 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -966,7 +966,7 @@ endif
 # emitted into sysd-rules.  A sysdeps Makeconfig fragment can
 # add its own special object file prefix to this list with e.g. foo-%:%
 # to have foo-*.? compiled from *.? using $(foo-CPPFLAGS).
-sysd-rules-patterns := %:% rtld-%:% m_%:s_%
+sysd-rules-patterns := %:% rtld-%:rtld-% rtld-%:% m_%:s_%
 
 # Let sysdeps/ subdirs contain a Makeconfig fragment for us to include here.
 sysdep-makeconfigs := $(wildcard $(+sysdep_dirs:=/Makeconfig))
@@ -975,8 +975,8 @@ include $(sysdep-makeconfigs)
 endif
 
 # Compute just the target patterns.  Makeconfig has set sysd-rules-patterns.
-sysd-rules-targets := $(foreach p,$(sysd-rules-patterns),\
-                               $(firstword $(subst :, ,$p)))
+sysd-rules-targets := $(sort $(foreach p,$(sysd-rules-patterns),\
+                                      $(firstword $(subst :, ,$p))))
 
 endif # Makeconfig not yet included
 

diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 9f31a560e52f69a7d5e93c1b1c644d364fabb8aa..fc225f25cc41df8bccd7cb04faedbba4892f5a19 100644 (file)
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -93,6 +93,12 @@ else
 # These are the basic compilation rules corresponding to the Makerules ones.
 # The sysd-rules generated makefile already defines pattern rules for rtld-%
 # targets built from sysdeps source files.
+$(objpfx)rtld-%.os: rtld-%.S $(before-compile)
+       $(compile-command.S) $(rtld-CPPFLAGS)
+$(objpfx)rtld-%.os: rtld-%.s $(before-compile)
+       $(compile-command.s) $(rtld-CPPFLAGS)
+$(objpfx)rtld-%.os: rtld-%.c $(before-compile)
+       $(compile-command.c) $(rtld-CPPFLAGS)
 $(objpfx)rtld-%.os: %.S $(before-compile)
        $(compile-command.S) $(rtld-CPPFLAGS)
 $(objpfx)rtld-%.os: %.s $(before-compile)
@@ -101,6 +107,9 @@ $(objpfx)rtld-%.os: %.c $(before-compile)
        $(compile-command.c) $(rtld-CPPFLAGS)
 
 # The rules for generated source files.
+$(objpfx)rtld-%.os: $(objpfx)rtld-%.S $(before-compile); $(compile-command.S)
+$(objpfx)rtld-%.os: $(objpfx)rtld-%.s $(before-compile); $(compile-command.s)
+$(objpfx)rtld-%.os: $(objpfx)rtld-%.c $(before-compile); $(compile-command.c)
 $(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile); $(compile-command.S)
 $(objpfx)rtld-%.os: $(objpfx)%.s $(before-compile); $(compile-command.s)
 $(objpfx)rtld-%.os: $(objpfx)%.c $(before-compile); $(compile-command.c)