diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-07-22 08:57:19 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-07-22 08:57:19 +0000 |
| commit | 89126f58fdbdc03ac61da7f1a0f2db47dfd8d9ef (patch) | |
| tree | 331916c2586a8df5be3efca00cb1645dee2200da | |
| parent | 3bf0ae1ed2f38131a27ef912a80e415c69490910 (diff) | |
| download | glibc-89126f58fdbdc03ac61da7f1a0f2db47dfd8d9ef.tar.gz glibc-89126f58fdbdc03ac61da7f1a0f2db47dfd8d9ef.tar.xz glibc-89126f58fdbdc03ac61da7f1a0f2db47dfd8d9ef.zip | |
Mini merge from HEAD.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules | 2 | ||||
| -rw-r--r-- | nscd/Makefile | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2d1bc63dea..5f17bbc773 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 e95d3107ec..37915599df 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 5a2d29a0a5..b7d5f3400b 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) \ |