diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | malloc/mtrace.c | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 13 |
3 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index e237ba9bd0..4b95b384f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-05-05 Ulrich Drepper <drepper@redhat.com> + + * malloc/mtrace.c: Comment out use of _mtrace_file and _mtrace_len. + 2002-05-04 Ulrich Drepper <drepper@redhat.com> * locale/duplocale.c (__duplocale): Update special members only diff --git a/malloc/mtrace.c b/malloc/mtrace.c index 5c82e1d1e4..171eb5a570 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -59,10 +59,12 @@ __libc_lock_define_initialized (static, lock); /* Address to breakpoint on accesses to... */ __ptr_t mallwatch; +#ifdef USE_MTRACE_FILE /* File name and line number information, for callers that had the foresight to call through a macro. */ -char *_mtrace_file attribute_hidden; -int _mtrace_line attribute_hidden; +char *_mtrace_file; +int _mtrace_line; +#endif /* Old hook values. */ static void (*tr_old_free_hook) __P ((__ptr_t ptr, const __ptr_t)); @@ -89,12 +91,15 @@ internal_function tr_where (caller) const __ptr_t caller; { +#ifdef USE_MTRACE_FILE if (_mtrace_file) { fprintf (mallstream, "@ %s:%d ", _mtrace_file, _mtrace_line); _mtrace_file = NULL; } - else if (caller != NULL) + else +#endif + if (caller != NULL) { #ifdef HAVE_ELF Dl_info info; diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 843ccc1c54..daeee5f113 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -1,8 +1,5 @@ # Local configure fragment for sysdeps/unix/sysv/linux. -# On Linux, the default is to use libio instead of stdio. -test $stdio = default && stdio=libio - # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes @@ -12,12 +9,12 @@ if test -n "$sysheaders"; then CPPFLAGS="$CPPFLAGS $SYSINCLUDES" fi echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6 -echo "configure:16: checking installed Linux kernel header files" >&5 +echo "configure:13: checking installed Linux kernel header files" >&5 if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21 "configure" +#line 18 "configure" #include "confdefs.h" #include <linux/version.h> #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 10) /* 2.0.10 */ @@ -122,11 +119,11 @@ fi if test -n "$minimum_kernel"; then echo $ac_n "checking for kernel header at least $minimum_kernel""... $ac_c" 1>&6 -echo "configure:126: checking for kernel header at least $minimum_kernel" >&5 +echo "configure:123: checking for kernel header at least $minimum_kernel" >&5 decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; cat > conftest.$ac_ext <<EOF -#line 130 "configure" +#line 127 "configure" #include "confdefs.h" #include <linux/version.h> #if LINUX_VERSION_CODE < $decnum @@ -256,7 +253,7 @@ if test $host = $build; then ac_prefix=$ac_default_prefix fi echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6 -echo "configure:260: checking for symlinks in ${ac_prefix}/include" >&5 +echo "configure:257: checking for symlinks in ${ac_prefix}/include" >&5 ac_message= if test -L ${ac_prefix}/include/net; then ac_message="$ac_message |