From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-7910-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 11389 invoked by alias); 16 Sep 2004 15:10:53 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 11368 invoked from network); 16 Sep 2004 15:10:51 -0000
Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26)
  by sourceware.org with SMTP; 16 Sep 2004 15:10:51 -0000
Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i8GFAi3j018714;
	Thu, 16 Sep 2004 17:10:44 +0200
Received: (from jakub@localhost)
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i8GFAieJ018710;
	Thu, 16 Sep 2004 17:10:44 +0200
Date: Thu, 16 Sep 2004 15:10:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] nscd fixes
Message-ID: <20040916151043.GG30497@sunsite.ms.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-SW-Source: 2004-09/txt/msg00061.txt.bz2

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