about summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-31 06:37:47 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-31 06:37:47 +0000
commitb2fe29ddb550a0f8c6d92b6d4467dd8f0bc1f1c8 (patch)
tree55019e54dfe941dff3c4b14ecfd1bb03f12e5fef /iconvdata
parentf55727ca53308a206cf00d0442f8c57c73761899 (diff)
downloadglibc-b2fe29ddb550a0f8c6d92b6d4467dd8f0bc1f1c8.tar.gz
glibc-b2fe29ddb550a0f8c6d92b6d4467dd8f0bc1f1c8.tar.xz
glibc-b2fe29ddb550a0f8c6d92b6d4467dd8f0bc1f1c8.zip
Update.
	* iconv/gconv_conf.c (insert_module): Take extra parameter to decide
	whether the new record should be freed if it's a duplicate.
	(add_module): Adjust insert_module call.
	(__gconv_read_conf): Likewise.
	* iconvdata/Makefile (generated): Add tst-loading.mtrace and
	mtrace-tst-loading.
	(tests): Make $(objpfx)mtrace-tst-loading a dependency.  Add rule.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index a70d9b4ec3..eaeeb411c2 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -169,7 +169,7 @@ generated-modules := $(gen-8bit-modules) $(gen-8bit-gap-modules) \
 		     $(gen-special-modules)
 
 generated = $(generated-modules:=.h) $(generated-modules:=.stmp) \
-	    iconv-test.out iconv-rules
+	    iconv-test.out iconv-rules tst-loading.mtrace mtrace-tst-loading
 ifdef objpfx
 generated += gconv-modules
 endif
@@ -244,10 +244,14 @@ include ../Rules
 
 ifeq (no,$(cross-compiling))
 ifeq (yes,$(build-shared))
-tests: $(objpfx)iconv-test.out
+tests: $(objpfx)iconv-test.out $(objpfx)mtrace-tst-loading
 endif
 endif
 
+tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
+$(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out
+	$(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
+
 $(objpfx)bug-iconv1.out: $(objpfx)gconv-modules
 
 $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \