diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-10-05 09:26:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-10-05 09:26:23 +0000 |
| commit | 6ab5f50de41c22de3752722108def4ae721aec13 (patch) | |
| tree | 8216df42a3ec79a3a80501cdf224b61d9f6aa383 /nscd/Makefile | |
| parent | e14bbf537e28b5470e5491bf0c1dc3d8849bc283 (diff) | |
| download | glibc-6ab5f50de41c22de3752722108def4ae721aec13.tar glibc-6ab5f50de41c22de3752722108def4ae721aec13.tar.gz glibc-6ab5f50de41c22de3752722108def4ae721aec13.tar.bz2 glibc-6ab5f50de41c22de3752722108def4ae721aec13.zip | |
Update.
2004-10-05 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Return 200112L
for _SC_CPUTIME or _SC_THREAD_CPUTIME.
* nscd/Makefile (nscd-cflags): Set to -DIS_IN_nscd=1, plus
-fpie if building PIE.
(CFLAGS-*.c): Use it.
* nscd/Makefile (relro-LDFLAGS): Add -Wl,-z,now if have-z-relro.
($(objpfx)nscd): Add $(relro-LDFLAGS).
* sysdeps/unix/sysv/linux/i386/sysconf.c: Include hp-timing.h.
(__sysconf): Return -1 for _SC_CPUTIME or _SC_THREAD_CPUTIME if
!HP_TIMING_AVAIL.
2004-10-05 Ulrich Drepper <drepper@redhat.com>
* nscd/Makefile (distribute): Remove TODO.
* nscd/TODO: Removed.
Diffstat (limited to 'nscd/Makefile')
| -rw-r--r-- | nscd/Makefile | 59 |
1 files changed, 34 insertions, 25 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index 16d67bd1d4..70a35198c2 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -58,7 +58,7 @@ endif distribute := nscd.h nscd-client.h dbg_log.h \ $(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \ - nscd_nischeck.c TODO nscd.conf nscd.init nscd_proto.h \ + nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \ nscd-types.h include ../Rules @@ -69,34 +69,43 @@ CFLAGS-nscd_gethst_r.c = -fexceptions CFLAGS-nscd_getai.c = -fexceptions CFLAGS-nscd_initgroups.c = -fexceptions +nscd-cflags = -DIS_IN_nscd=1 ifeq (yesyes,$(have-fpie)$(build-shared)) -CFLAGS-nscd.c += -fpie -CFLAGS-connections.c += -fpie -CFLAGS-pwdcache.c += -fpie -CFLAGS-getpwnam_r.c += -fpie -CFLAGS-getpwuid_r.c += -fpie -CFLAGS-grpcache.c += -fpie -CFLAGS-getgrnam_r.c += -fpie -CFLAGS-getgrgid_r.c += -fpie -CFLAGS-hstcache.c += -fpie -CFLAGS-gethstbyad_r.c += -fpie -CFLAGS-gethstbynm2_r.c += -fpie -CFLAGS-dbg_log.c += -fpie -CFLAGS-nscd_conf.c += -fpie -CFLAGS-nscd_stat.c += -fpie -CFLAGS-cache.c += -fpie -CFLAGS-xmalloc.c += -fpie -CFLAGS-xstrdup.c += -fpie -CFLAGS-mem.c += -fpie -CFLAGS-nscd_setup_thread.c += -fpie -CFLAGS-aicache.c += -fpie -CFLAGS-selinux.c += -fpie -CFLAGS-initgrcache.c += -fpie -CFLAGS-gai.c += -fpie +nscd-cflags += -fpie +endif + +CFLAGS-nscd.c += $(nscd-cflags) +CFLAGS-connections.c += $(nscd-cflags) +CFLAGS-pwdcache.c += $(nscd-cflags) +CFLAGS-getpwnam_r.c += $(nscd-cflags) +CFLAGS-getpwuid_r.c += $(nscd-cflags) +CFLAGS-grpcache.c += $(nscd-cflags) +CFLAGS-getgrnam_r.c += $(nscd-cflags) +CFLAGS-getgrgid_r.c += $(nscd-cflags) +CFLAGS-hstcache.c += $(nscd-cflags) +CFLAGS-gethstbyad_r.c += $(nscd-cflags) +CFLAGS-gethstbynm2_r.c += $(nscd-cflags) +CFLAGS-dbg_log.c += $(nscd-cflags) +CFLAGS-nscd_conf.c += $(nscd-cflags) +CFLAGS-nscd_stat.c += $(nscd-cflags) +CFLAGS-cache.c += $(nscd-cflags) +CFLAGS-xmalloc.c += $(nscd-cflags) +CFLAGS-xstrdup.c += $(nscd-cflags) +CFLAGS-mem.c += $(nscd-cflags) +CFLAGS-nscd_setup_thread.c += $(nscd-cflags) +CFLAGS-aicache.c += $(nscd-cflags) +CFLAGS-selinux.c += $(nscd-cflags) +CFLAGS-initgrcache.c += $(nscd-cflags) +CFLAGS-gai.c += $(nscd-cflags) + +ifeq (yesyes,$(have-fpie)$(build-shared)) +ifeq (yes,$(have-z-relro)) +relro-LDFLAGS += -Wl,-z,now +endif $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) $(LINK.o) -pie -Wl,-O1 \ - $(sysdep-LDFLAGS) $(config-LDFLAGS) \ + $(sysdep-LDFLAGS) $(config-LDFLAGS) $(relro-LDFLAGS) \ $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ $(LDFLAGS) $(LDFLAGS-$(@F)) \ |