diff options
| -rw-r--r-- | malloc/Makefile | 26 | ||||
| -rw-r--r-- | sysdeps/alpha/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/arm/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/i386/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/ia64/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/m68k/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/mips/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/powerpc/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/sh/memusage.h | 2 | ||||
| -rw-r--r-- | sysdeps/sparc/memusage.h | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/malloc/Makefile b/malloc/Makefile index 7614a0a359..55476ca812 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -27,8 +27,8 @@ dist-headers := malloc.h headers := $(dist-headers) obstack.h mcheck.h tests := mallocbug tst-malloc tst-valloc tst-calloc -distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memprof.h \ - memprof.sh memprofstat.c +distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memusage.h \ + memusage.sh memusagestat.c # Things which get pasted together into gmalloc.c. gmalloc-routines := malloc morecore @@ -40,11 +40,11 @@ install-lib := libmcheck.a non-lib.a := libmcheck.a # Additional library. -extra-libs = libmemprof +extra-libs = libmemusage extra-libs-others = $(extra-libs) -libmemprof-routines = memprof -libmemprof-inhibit-o = $(filter-out .os,$(object-suffixes)) +libmemusage-routines = memusage +libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes)) # These should be removed by `make clean'. extra-objs = mcheck-init.o libmcheck.a @@ -68,17 +68,17 @@ address-width=18 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) -install-bin += memprofstat memprof +install-bin += memusagestat memusage endif # Another goal which can be used to override the configure decision. -.PHONY: do-memprofstat -do-memprofstat: $(objpfx)memprofstat +.PHONY: do-memusagestat +do-memusagestat: $(objpfx)memusagestat -memprofstat-modules = memprofstat -$(objpfx)memprofstat: $(memprofstat-modules:%=$(objpfx)%.o) +memusagestat-modules = memusagestat +$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o) $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz include ../Rules @@ -100,7 +100,7 @@ $(objpfx)mtrace: mtrace.pl -e 's|@VERSION@|$(version)|' $^ > $@.new \ && rm -f $@ && mv $@.new $@ && chmod +x $@ -$(objpfx)memprof: memprof.sh +$(objpfx)memusage: memusage.sh rm -f $@.new sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ -e 's|@LIBDIR@|$(libdir)|' -e 's|@BINDIR@|$(bindir)|' $^ > $@.new \ @@ -108,4 +108,4 @@ $(objpfx)memprof: memprof.sh # The implementation uses `dlsym' -$(objpfx)libmemprof.so: $(common-objpfx)dlfcn/libdl.so +$(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so diff --git a/sysdeps/alpha/memusage.h b/sysdeps/alpha/memusage.h index 462b5ce1c2..4b8f455601 100644 --- a/sysdeps/alpha/memusage.h +++ b/sysdeps/alpha/memusage.h @@ -18,4 +18,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("$30"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/arm/memusage.h b/sysdeps/arm/memusage.h index 4e5081c167..86ab085ef2 100644 --- a/sysdeps/arm/memusage.h +++ b/sysdeps/arm/memusage.h @@ -18,4 +18,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("sp"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/i386/memusage.h b/sysdeps/i386/memusage.h index c1b047f556..2ad4e9080f 100644 --- a/sysdeps/i386/memusage.h +++ b/sysdeps/i386/memusage.h @@ -19,4 +19,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("esp"); stack_ptr; }) #define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high)) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/ia64/memusage.h b/sysdeps/ia64/memusage.h index e447a735e0..6e03500714 100644 --- a/sysdeps/ia64/memusage.h +++ b/sysdeps/ia64/memusage.h @@ -19,4 +19,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("%r12"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/m68k/memusage.h b/sysdeps/m68k/memusage.h index 5fd1cf4282..72138e2180 100644 --- a/sysdeps/m68k/memusage.h +++ b/sysdeps/m68k/memusage.h @@ -19,4 +19,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/mips/memusage.h b/sysdeps/mips/memusage.h index 93f2917d8c..8e421e4c24 100644 --- a/sysdeps/mips/memusage.h +++ b/sysdeps/mips/memusage.h @@ -18,4 +18,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("$29"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/powerpc/memusage.h b/sysdeps/powerpc/memusage.h index 05c8e78b38..b586a15e63 100644 --- a/sysdeps/powerpc/memusage.h +++ b/sysdeps/powerpc/memusage.h @@ -18,4 +18,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("%r1"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/sh/memusage.h b/sysdeps/sh/memusage.h index a02949f291..ae98cb3fe9 100644 --- a/sysdeps/sh/memusage.h +++ b/sysdeps/sh/memusage.h @@ -18,4 +18,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("r15"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> diff --git a/sysdeps/sparc/memusage.h b/sysdeps/sparc/memusage.h index 090e02ae88..8a36a09fdb 100644 --- a/sysdeps/sparc/memusage.h +++ b/sysdeps/sparc/memusage.h @@ -18,4 +18,4 @@ #define GETSP() ({ register uintptr_t stack_ptr asm ("%sp"); stack_ptr; }) -#include <sysdeps/generic/memprof.h> +#include <sysdeps/generic/memusage.h> |