From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 22 Jul 2005 08:57:19 +0000 (+0000)
Subject: Mini merge from HEAD.
X-Git-Tag: cvs/fedora-glibc-2_3_90-5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89126f58fdbdc03ac61da7f1a0f2db47dfd8d9ef;p=thirdparty%2Fglibc.git

Mini merge from HEAD.
---

diff --git a/ChangeLog b/ChangeLog
index 2d1bc63dea8..5f17bbc773c 100644
--- 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 e95d3107ecd..37915599df6 100644
--- 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 5a2d29a0a5a..b7d5f3400b6 100644
--- 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) \