Mini merge from HEAD.

diff --git a/ChangeLog b/ChangeLog
index 2d1bc63dea8b99daa37e96f99383c676eb2113a6..5f17bbc773c42747dc6d2a346bfb91690686ad9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2005-07-22  Roland McGrath  <roland@redhat.com>
+
+       [BZ #869]
+       * Makerules ($(objpfx)stubs): Fix last change.
+
 2005-07-21  Roland McGrath  <roland@redhat.com>
 
+       * nscd/Makefile ($(objpfx)nscd): Pass $(nscd-cflags) to $(LINK.o).
+
        * stdlib/Makefile (headers): Move bits/wchar.h to ...
        * wcsmbs/Makefile (headers): ... here.  Add bits/wchar2.h too.
 

diff --git a/Makerules b/Makerules
index e95d3107ecd98c0eba192274a9519bdfb1f8035b..37915599df6b71dc18433f51f6046ab6b3343774 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1390,7 +1390,7 @@ objs-for-stubs := $(foreach o,$(object-suffixes-for-libc),$(o-objects)) \
                  $(addprefix $(objpfx),$(extra-objs))
 $(objpfx)stubs: $(objs-for-stubs)
 ifneq (,$(strip $(objs-for-stubs)))
-       (cd $(objdir); $(OBJDUMP) -h $(patsubst $(objpfx)%,%,$^)) | \
+       (cd $(objpfx).; $(OBJDUMP) -h $(patsubst $(objpfx)%,%,$^)) | \
        $(AWK) '/\.gnu\.glibc-stub\./ { \
                  sub(/\.gnu\.glibc-stub\./, "", $$2); \
                  stubs[$$2] = 1; } \

diff --git a/nscd/Makefile b/nscd/Makefile
index 5a2d29a0a5acfd690a2ac840f212ebc493f2fe7a..b7d5f3400b6a5d3b8b5b352eb725d64151eadb10 100644 (file)
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -122,7 +122,7 @@ relro-LDFLAGS += -Wl,-z,now
 endif
 
 $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
-       $(LINK.o) -pie -Wl,-O1 \
+       $(LINK.o) -pie -Wl,-O1 $(nscd-cflags) \
          $(sysdep-LDFLAGS) $(config-LDFLAGS) $(relro-LDFLAGS) \
          $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
          $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \