Update for memprof->memusage renaming.

This commit is contained in:
Ulrich Drepper 2000-06-20 06:36:03 +00:00
parent fa4a5fe7bd
commit e5874a4233
10 changed files with 22 additions and 22 deletions

View File

@ -27,8 +27,8 @@ dist-headers := malloc.h
headers := $(dist-headers) obstack.h mcheck.h headers := $(dist-headers) obstack.h mcheck.h
tests := mallocbug tst-malloc tst-valloc tst-calloc tests := mallocbug tst-malloc tst-valloc tst-calloc
distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memprof.h \ distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memusage.h \
memprof.sh memprofstat.c memusage.sh memusagestat.c
# Things which get pasted together into gmalloc.c. # Things which get pasted together into gmalloc.c.
gmalloc-routines := malloc morecore gmalloc-routines := malloc morecore
@ -40,11 +40,11 @@ install-lib := libmcheck.a
non-lib.a := libmcheck.a non-lib.a := libmcheck.a
# Additional library. # Additional library.
extra-libs = libmemprof extra-libs = libmemusage
extra-libs-others = $(extra-libs) extra-libs-others = $(extra-libs)
libmemprof-routines = memprof libmemusage-routines = memusage
libmemprof-inhibit-o = $(filter-out .os,$(object-suffixes)) libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
# These should be removed by `make clean'. # These should be removed by `make clean'.
extra-objs = mcheck-init.o libmcheck.a extra-objs = mcheck-init.o libmcheck.a
@ -68,17 +68,17 @@ address-width=18
endif endif
endif endif
# If the gd library is available we build the `memprofstat' program. # If the gd library is available we build the `memusagestat' program.
ifneq ($(LIBGD),no) ifneq ($(LIBGD),no)
install-bin += memprofstat memprof install-bin += memusagestat memusage
endif endif
# Another goal which can be used to override the configure decision. # Another goal which can be used to override the configure decision.
.PHONY: do-memprofstat .PHONY: do-memusagestat
do-memprofstat: $(objpfx)memprofstat do-memusagestat: $(objpfx)memusagestat
memprofstat-modules = memprofstat memusagestat-modules = memusagestat
$(objpfx)memprofstat: $(memprofstat-modules:%=$(objpfx)%.o) $(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
$(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz
include ../Rules include ../Rules
@ -100,7 +100,7 @@ $(objpfx)mtrace: mtrace.pl
-e 's|@VERSION@|$(version)|' $^ > $@.new \ -e 's|@VERSION@|$(version)|' $^ > $@.new \
&& rm -f $@ && mv $@.new $@ && chmod +x $@ && rm -f $@ && mv $@.new $@ && chmod +x $@
$(objpfx)memprof: memprof.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|@LIBDIR@|$(libdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \ -e 's|@LIBDIR@|$(libdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \
@ -108,4 +108,4 @@ $(objpfx)memprof: memprof.sh
# The implementation uses `dlsym' # The implementation uses `dlsym'
$(objpfx)libmemprof.so: $(common-objpfx)dlfcn/libdl.so $(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so

View File

@ -18,4 +18,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("$30"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("$30"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -18,4 +18,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("sp"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("sp"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -19,4 +19,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("esp"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("esp"); stack_ptr; })
#define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high)) #define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high))
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -19,4 +19,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("%r12"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("%r12"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -19,4 +19,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -18,4 +18,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("$29"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("$29"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -18,4 +18,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("%r1"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("%r1"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -18,4 +18,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("r15"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("r15"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>

View File

@ -18,4 +18,4 @@
#define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; }) #define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; })
#include <sysdeps/generic/memprof.h> #include <sysdeps/generic/memusage.h>