This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] nscd fixes


Hi!

a) allow nscd to even compile on x86-64 (missing -fpie)
b) get rid of newly introduced munmap .plt slot

2004-09-16  Jakub Jelinek  <jakub@redhat.com>

	* nscd/nscd_helper.c (__nscd_unmap, get_mapping): Use __munmap
	instead of munmap.

	* nscd/Makefile (CFLAGS-aicache.c): Set to -fpie.

--- libc/nscd/nscd_helper.c.jj	2004-09-14 00:32:54.000000000 +0200
+++ libc/nscd/nscd_helper.c	2004-09-16 17:07:23.384149635 +0200
@@ -72,7 +72,7 @@ void
 __nscd_unmap (struct mapped_database *mapped)
 {
   assert (mapped->counter == 0);
-  munmap ((void *) mapped->head, mapped->mapsize);
+  __munmap ((void *) mapped->head, mapped->mapsize);
   free (mapped);
 }
 
@@ -180,7 +180,7 @@ get_mapping (request_type type, const ch
       if (newp == NULL)
 	{
 	  /* Ugh, after all we went through the memory allocation failed.  */
-	  munmap (result, size);
+	  __munmap (result, size);
 	  goto out_close;
 	}
 
--- libc/nscd/Makefile.jj	2004-09-16 11:38:00.000000000 +0200
+++ libc/nscd/Makefile	2004-09-16 17:03:40.685497693 +0200
@@ -82,6 +82,7 @@ CFLAGS-xmalloc.c = -fpie
 CFLAGS-xstrdup.c = -fpie
 CFLAGS-mem.c = -fpie
 CFLAGS-nscd_setup_thread.c = -fpie
+CFLAGS-aicache.c = -fpie
 
 $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
 	$(LINK.o) -pie -Wl,-O1 \

	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]