* malloc/memusage.sh (memusageso): Add quotes.

(memusagestat): Likewise.
	* debug/xtrace.sh (pcprofileso): Likewise.
	(pcprofiledump): Likewise.
	* debug/Makefile ($(objpfx)xtrace): Use $LIB in SLIBDIR
	replacement.
	* malloc/Makefile ($(objpfx)memusage): Likewise.
This commit is contained in:
Ulrich Drepper 2006-05-19 16:48:27 +00:00
parent 882bfe73fd
commit f50fa10c8a
5 changed files with 21 additions and 8 deletions

View File

@ -1,5 +1,13 @@
2006-05-19 Ulrich Drepper <drepper@redhat.com> 2006-05-19 Ulrich Drepper <drepper@redhat.com>
* malloc/memusage.sh (memusageso): Add quotes.
(memusagestat): Likewise.
* debug/xtrace.sh (pcprofileso): Likewise.
(pcprofiledump): Likewise.
* debug/Makefile ($(objpfx)xtrace): Use $LIB in SLIBDIR
replacement.
* malloc/Makefile ($(objpfx)memusage): Likewise.
* nis/nis_callback.c (__nis_create_callback): Calls to * nis/nis_callback.c (__nis_create_callback): Calls to
svcudp_bufcreate and svctcp_create can fail. Free ->xprt if svcudp_bufcreate and svctcp_create can fail. Free ->xprt if
asprintf call fails. asprintf call fails.

View File

@ -1,4 +1,4 @@
# Copyright (C) 1998,1999,2000,2001,2004,2005 Free Software Foundation, Inc. # Copyright (C) 1998-2001,2004,2005,2006 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
@ -107,6 +107,8 @@ generated = catchsegv xtrace
include ../Rules include ../Rules
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
$(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \ $(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \
$(common-objpfx)config.make $(common-objpfx)config.make
slibpfx=`echo $(slibdir)|sed 's/lib\(64\|\)$$/\\\\\\\\$$LIB/'`; \ slibpfx=`echo $(slibdir)|sed 's/lib\(64\|\)$$/\\\\\\\\$$LIB/'`; \
@ -119,7 +121,7 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
$(objpfx)xtrace: xtrace.sh $(objpfx)xtrace: xtrace.sh
rm -f $@.new rm -f $@.new
sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
-e 's|@SLIBDIR@|$(slibdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@ && rm -f $@ && mv $@.new $@ && chmod +x $@
# Depend on libc.so so a DT_NEEDED is generated in the shared objects. # Depend on libc.so so a DT_NEEDED is generated in the shared objects.

View File

@ -18,8 +18,8 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA. # 02111-1307 USA.
pcprofileso=@SLIBDIR@/libpcprofile.so pcprofileso='@SLIBDIR@/libpcprofile.so'
pcprofiledump=@BINDIR@/pcprofiledump pcprofiledump='@BINDIR@/pcprofiledump'
TEXTDOMAIN=libc TEXTDOMAIN=libc
# Print usage message. # Print usage message.

View File

@ -1,4 +1,4 @@
# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005 # Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.
@ -79,6 +79,7 @@ endif
ifneq ($(cross-compiling),yes) ifneq ($(cross-compiling),yes)
# If the gd library is available we build the `memusagestat' program. # If the gd library is available we build the `memusagestat' program.
ifneq ($(LIBGD),no) ifneq ($(LIBGD),no)
others: $(objpfx)memusage
install-bin = memusagestat install-bin = memusagestat
install-bin-script += memusage install-bin-script += memusage
generated += memusagestat memusage generated += memusagestat memusage
@ -126,6 +127,8 @@ tst-mcheck-ENV = MALLOC_CHECK_=3
# Uncomment this for test releases. For public releases it is too expensive. # Uncomment this for test releases. For public releases it is too expensive.
#CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1 #CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
$(objpfx)mtrace: mtrace.pl $(objpfx)mtrace: mtrace.pl
rm -f $@.new rm -f $@.new
sed -e 's|@PERL@|$(PERL)|' -e 's|@XXX@|$(address-width)|' \ sed -e 's|@PERL@|$(PERL)|' -e 's|@XXX@|$(address-width)|' \
@ -135,7 +138,7 @@ $(objpfx)mtrace: mtrace.pl
$(objpfx)memusage: memusage.sh $(objpfx)memusage: memusage.sh
rm -f $@.new rm -f $@.new
sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \
-e 's|@SLIBDIR@|$(slibdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@ && rm -f $@ && mv $@.new $@ && chmod +x $@

View File

@ -18,8 +18,8 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA. # 02111-1307 USA.
memusageso=@SLIBDIR@/libmemusage.so memusageso='@SLIBDIR@/libmemusage.so'
memusagestat=@BINDIR@/memusagestat memusagestat='@BINDIR@/memusagestat'
TEXTDOMAIN=libc TEXTDOMAIN=libc
# Print usage message. # Print usage message.