From: Fred Fish Date: Wed, 14 Jan 1998 04:28:29 +0000 (+0000) Subject: * configure.in (--with-mmalloc): Add new configure arg to use the X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0728afad48a51e389aa62523f581407fd2a24e52;p=binutils-gdb.git * configure.in (--with-mmalloc): Add new configure arg to use the mmalloc package. Default is to not use it. (START_INFERIOR_TRAPS_EXPECTED): Define to the integer 2, not the string "2". * acconfig.h (USE_MMALLOC, FORCE_MMCHECK): Add #undef. * configure: Regenerated. * config.in: Regenerated. * Makefile.in (MMALLOC_DIR, MMALLOC_SRC): Remove. (MMALLOC): Set using configure. (MMALLOC_CFLAGS): Set using configure. * config/i386/tm-linux.h (sys_quotactl): Define to 1 rather than just defining it. * mpw-make.sed: Undefine USE_MMALLOC rather than defining NO_MMALLOC. * utils.c (NO_MMALLOC): Use USE_MMALLOC instead. * objfiles.c: ditto. * defs.h: ditto. * config/sparc/sun4os4.mh (MMALLOC_CFLAGS): Remove. * config/m68k/sun3os4.mh (MMALLOC_CFLAGS): Remove. * config/i386/cygwin32.mh (MMALLOC_CFLAGS): Remove. * config/alpha/alpha-osf3.mh (MMALLOC_CFLAGS): Remove. * config/alpha/alpha-osf2.mh (MMALLOC_CFLAGS): Remove. * gdbserver/Makefile.in (MMALLOC_*): Remove. * config/rs6000/rs6000.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/rs6000/aix4.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/powerpc/aix4.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/powerpc/aix.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/ns32k/ns32km3.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/mips/mipsm3.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/mips/decstation.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/m88k/cxux.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/i386/xm-windows.h (NO_MMALLOC, NO_MMCHECK): Remove. * config/i386/i386mk.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/i386/i386m3.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/i386/i386gnu.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/alpha/alpha-osf1.mh (MMALLOC, MMALLOC_CFLAGS): Remove. * config/alpha/alpha-linux.mh (MMALLOC, MMALLOC_CFLAGS): Remove. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ce14c384e09..a782655eb9b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,44 @@ +Tue Jan 13 16:38:48 1998 Fred Fish + + * configure.in (--with-mmalloc): Add new configure arg to use the + mmalloc package. Default is to not use it. + (START_INFERIOR_TRAPS_EXPECTED): Define to the integer 2, not + the string "2". + * acconfig.h (USE_MMALLOC, FORCE_MMCHECK): Add #undef. + * configure: Regenerated. + * config.in: Regenerated. + * Makefile.in (MMALLOC_DIR, MMALLOC_SRC): Remove. + (MMALLOC): Set using configure. + (MMALLOC_CFLAGS): Set using configure. + + * config/i386/tm-linux.h (sys_quotactl): Define to 1 rather + than just defining it. + * mpw-make.sed: Undefine USE_MMALLOC rather than defining NO_MMALLOC. + * utils.c (NO_MMALLOC): Use USE_MMALLOC instead. + * objfiles.c: ditto. + * defs.h: ditto. + + * config/sparc/sun4os4.mh (MMALLOC_CFLAGS): Remove. + * config/m68k/sun3os4.mh (MMALLOC_CFLAGS): Remove. + * config/i386/cygwin32.mh (MMALLOC_CFLAGS): Remove. + * config/alpha/alpha-osf3.mh (MMALLOC_CFLAGS): Remove. + * config/alpha/alpha-osf2.mh (MMALLOC_CFLAGS): Remove. + * gdbserver/Makefile.in (MMALLOC_*): Remove. + * config/rs6000/rs6000.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/rs6000/aix4.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/powerpc/aix4.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/powerpc/aix.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/ns32k/ns32km3.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/mips/mipsm3.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/mips/decstation.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/m88k/cxux.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/i386/xm-windows.h (NO_MMALLOC, NO_MMCHECK): Remove. + * config/i386/i386mk.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/i386/i386m3.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/i386/i386gnu.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/alpha/alpha-osf1.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + * config/alpha/alpha-linux.mh (MMALLOC, MMALLOC_CFLAGS): Remove. + Mon Jan 12 11:46:51 1998 Michael Snyder (msnyder@cleaver.cygnus.com) * config/m68k/tm-m68k.h (REGISTER_VIRTUAL_TYPE): make A0 thru A7 diff --git a/gdb/acconfig.h b/gdb/acconfig.h index bd53ec3e8f3..3978e0d2285 100644 --- a/gdb/acconfig.h +++ b/gdb/acconfig.h @@ -36,3 +36,12 @@ /* Define if you have HPUX threads */ #undef HAVE_HPUX_THREAD_SUPPORT + +/* Define if you want to use the memory mapped malloc package (mmalloc). */ +#undef USE_MMALLOC + +/* Define if the runtime uses a routine from mmalloc before gdb has a chance + to initialize mmalloc, and we want to force checking to be used anyway. + This may cause spurious memory corruption messages if the runtime tries + to explicitly deallocate that memory when gdb calls exit. */ +#undef FORCE_MMCHECK diff --git a/gdb/config.in b/gdb/config.in index 097f29e3c1b..ca169286e3a 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -72,6 +72,15 @@ /* Define if you have HPUX threads */ #undef HAVE_HPUX_THREAD_SUPPORT +/* Define if you want to use the memory mapped malloc package (mmalloc). */ +#undef USE_MMALLOC + +/* Define if the runtime uses a routine from mmalloc before gdb has a chance + to initialize mmalloc, and we want to force checking to be used anyway. + This may cause spurious memory corruption messages if the runtime tries + to explicitly deallocate that memory when gdb calls exit. */ +#undef FORCE_MMCHECK + /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh new file mode 100644 index 00000000000..5446a8296cc --- /dev/null +++ b/gdb/config/alpha/alpha-linux.mh @@ -0,0 +1,5 @@ +# Host: Little-endian Alpha running Linux +XDEPFILES= +XM_FILE= xm-alphalinux.h +NAT_FILE= nm-linux.h +NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o osfsolib.o diff --git a/gdb/config/i386/cygwin32.mh b/gdb/config/i386/cygwin32.mh index fac1bab14a5..f3ac44d4348 100644 --- a/gdb/config/i386/cygwin32.mh +++ b/gdb/config/i386/cygwin32.mh @@ -5,4 +5,4 @@ TERMCAP= NATDEPFILES= win32-nat.o NAT_FILE=../nm-empty.h XM_CLIBS= -MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DNO_MMCHECK + diff --git a/gdb/config/i386/i386m3.mh b/gdb/config/i386/i386m3.mh index 3b996df7e4b..0a83ebf7eac 100644 --- a/gdb/config/i386/i386m3.mh +++ b/gdb/config/i386/i386m3.mh @@ -5,7 +5,3 @@ NATDEPFILES= i386m3-nat.o m3-nat.o fork-child.o NAT_CLIBS= -lmachid -lnetname -lmach XM_FILE= xm-i386m3.h NAT_FILE= nm-m3.h - -# Don't use the mmalloc library in Mach 3. -MMALLOC = -MMALLOC_CFLAGS = -DNO_MMALLOC diff --git a/gdb/config/i386/i386mk.mh b/gdb/config/i386/i386mk.mh index 3b2d524e6af..849677cee07 100644 --- a/gdb/config/i386/i386mk.mh +++ b/gdb/config/i386/i386mk.mh @@ -2,7 +2,3 @@ XDEPFILES= os-mach3.o i386mach3-xdep.o i387-tdep.o XM_FILE= xm-i386osf1mk.h - -# Don't use the mmalloc library in Mach 3. -MMALLOC = -MMALLOC_CFLAGS = -DNO_MMALLOC diff --git a/gdb/config/i386/xm-windows.h b/gdb/config/i386/xm-windows.h index 91ca4d024df..96fd85439df 100644 --- a/gdb/config/i386/xm-windows.h +++ b/gdb/config/i386/xm-windows.h @@ -28,8 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define CANT_FORK #define MALLOC_INCOMPATIBLE -#define NO_MMALLOC -#define NO_MMCHECK #include diff --git a/gdb/config/m68k/sun3os4.mh b/gdb/config/m68k/sun3os4.mh index 3f63541462e..5d1bf523665 100644 --- a/gdb/config/m68k/sun3os4.mh +++ b/gdb/config/m68k/sun3os4.mh @@ -4,9 +4,3 @@ XM_FILE= xm-sun3os4.h NAT_FILE= nm-sun3.h NATDEPFILES= fork-child.o inftarg.o infptrace.o corelow.o sun3-nat.o GDBSERVER_DEPFILES= low-sun3.o - -# SunOS 4.x has memory allocation calls in the C runtime. However -# since free() is never called with these objects, it is safe to -# define MMCHECK_FORCE to 1 and thus force installation of the mmalloc -# corruption checks. -MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DMMCHECK_FORCE=1 diff --git a/gdb/config/m88k/cxux.mh b/gdb/config/m88k/cxux.mh index cc3cfc29002..cb02225cbd2 100644 --- a/gdb/config/m88k/cxux.mh +++ b/gdb/config/m88k/cxux.mh @@ -5,6 +5,3 @@ XDEPFILES= NAT_FILE= nm-cxux.h NATDEPFILES= infptrace.o inftarg.o fork-child.o cxux-nat.o corelow.o core-aout.o - -MMALLOC= -MMALLOC_CFLAGS= -DNO_MMALLOC diff --git a/gdb/config/mips/decstation.mh b/gdb/config/mips/decstation.mh index d7baecf1e3c..da417b29fda 100644 --- a/gdb/config/mips/decstation.mh +++ b/gdb/config/mips/decstation.mh @@ -3,9 +3,3 @@ XDEPFILES= XM_FILE= xm-mips.h NAT_FILE= nm-mips.h NATDEPFILES= infptrace.o inftarg.o corelow.o mips-nat.o fork-child.o - -# We can't use MMALLOC because the DECstation RPC library can't cope -# with a malloc(0) that returns 0. Besides, it's useless on a machine -# without a real mmap(). -MMALLOC = -MMALLOC_CFLAGS = -DNO_MMALLOC diff --git a/gdb/config/mips/mipsm3.mh b/gdb/config/mips/mipsm3.mh index 3be486f00cf..e049d682a39 100644 --- a/gdb/config/mips/mipsm3.mh +++ b/gdb/config/mips/mipsm3.mh @@ -5,7 +5,3 @@ XDEPFILES= core-aout.o NATDEPFILES= mipsm3-nat.o m3-nat.o XM_FILE= xm-mipsm3.h NAT_FILE= ../nm-m3.h - -# Don't use the mmalloc library in Mach 3. -MMALLOC = -MMALLOC_CFLAGS = -DNO_MMALLOC diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh index 363b04da90e..7f0992afa40 100644 --- a/gdb/config/ns32k/ns32km3.mh +++ b/gdb/config/ns32k/ns32km3.mh @@ -5,7 +5,3 @@ NATDEPFILES= m3-nat.o ns32km3-nat.o fork-child.o corelow.o core-aout.o NAT_CLIBS= -L/usr/mach/lib -lnetname -lmachid -lmach XM_FILE= xm-ns32km3.h NAT_FILE= nm-m3.h - -# Don't use the mmalloc library in Mach 3. -MMALLOC = -MMALLOC_CFLAGS = -DNO_MMALLOC diff --git a/gdb/config/powerpc/aix4.mh b/gdb/config/powerpc/aix4.mh index c49e639d09c..2407231451a 100644 --- a/gdb/config/powerpc/aix4.mh +++ b/gdb/config/powerpc/aix4.mh @@ -10,11 +10,6 @@ NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o xcoffread # We have no idea who our current compiler is though, so we skip it. # MH_CFLAGS = -bnodelcsect -# Because of shared libraries, we risk ending up with *two* -# incompatible versions of malloc if we use GNU malloc ... -MMALLOC = -MMALLOC_CFLAGS = -DNO_MMALLOC - # Rumor has it that libtermcap is "not really functional", and that # -lcurses is better. TERMCAP= -lcurses diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh index 7b3709a713c..4047c5cb82a 100644 --- a/gdb/config/sparc/sun4os4.mh +++ b/gdb/config/sparc/sun4os4.mh @@ -9,9 +9,3 @@ GDBSERVER_DEPFILES= low-sparc.o # anyone who wants to use NIS, which includes at least one Cygnus customer # (PR 3593). So leave it this way until/unless we find a resolver which can # get names from either DNS or NIS from the same GDB binary. - -# SunOS 4.x has memory allocation calls in the C runtime. However -# since free() is never called with these objects, it is safe to -# define MMCHECK_FORCE to 1 and thus force installation of the mmalloc -# corruption checks. -MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DMMCHECK_FORCE=1 diff --git a/gdb/configure b/gdb/configure index 2ce769af9bc..fad76eddf35 100755 --- a/gdb/configure +++ b/gdb/configure @@ -13,6 +13,8 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --enable-netrom " +ac_help="$ac_help + --with-mmalloc use memory mapped malloc package" ac_help="$ac_help --enable-ide Enable IDE support" ac_help="$ac_help @@ -540,7 +542,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:544: checking for $ac_word" >&5 +echo "configure:546: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -569,7 +571,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:573: checking for $ac_word" >&5 +echo "configure:575: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -617,7 +619,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:621: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:623: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -627,11 +629,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -651,12 +653,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:655: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:660: checking whether we are using GNU C" >&5 +echo "configure:662: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -665,7 +667,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -680,7 +682,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:684: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:686: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -708,7 +710,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:712: checking how to run the C preprocessor" >&5 +echo "configure:714: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -723,13 +725,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -740,13 +742,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -769,9 +771,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:773: checking for AIX" >&5 +echo "configure:775: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:798: checking for minix/config.h" >&5 +echo "configure:800: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -842,7 +844,7 @@ EOF fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:846: checking for POSIXized ISC" >&5 +echo "configure:848: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -913,7 +915,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:917: checking host system type" >&5 +echo "configure:919: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -934,7 +936,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:938: checking target system type" >&5 +echo "configure:940: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -952,7 +954,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:956: checking build system type" >&5 +echo "configure:958: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -999,7 +1001,7 @@ configdirs="doc testsuite" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1003: checking for a BSD compatible install" >&5 +echo "configure:1005: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1058,7 +1060,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1062: checking for $ac_word" >&5 +echo "configure:1064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1089,7 +1091,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1093: checking for $ac_word" >&5 +echo "configure:1095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1120,7 +1122,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1124: checking for $ac_word" >&5 +echo "configure:1126: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1156,7 +1158,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1160: checking for $ac_word" >&5 +echo "configure:1162: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1190,7 +1192,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1194: checking for $ac_word" >&5 +echo "configure:1196: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1240,12 +1242,12 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1244: checking return type of signal handlers" >&5 +echo "configure:1246: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1262,7 +1264,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1282,12 +1284,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1286: checking for ANSI C header files" >&5 +echo "configure:1288: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1295,7 +1297,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1312,7 +1314,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1330,7 +1332,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1351,7 +1353,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1362,7 +1364,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1389,17 +1391,17 @@ for ac_hdr in limits.h memory.h string.h strings.h unistd.h termios.h termio.h s do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1393: checking for $ac_hdr" >&5 +echo "configure:1395: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1426,12 +1428,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:1430: checking whether stat file-mode macros are broken" >&5 +echo "configure:1432: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1483,12 +1485,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1487: checking for working const" >&5 +echo "configure:1489: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1561,12 +1563,12 @@ fi for ac_func in setpgid sbrk select poll sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1565: checking for $ac_func" >&5 +echo "configure:1567: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1617,9 +1619,9 @@ done # If we are configured native on Linux, work around problems with sys/procfs.h if test "${target}" = "${host}"; then case "${host}" in - i345686-*-linux*) + i[3456]86-*-linux*) cat >> confdefs.h <<\EOF -#define START_INFERIOR_TRAPS_EXPECTED "2" +#define START_INFERIOR_TRAPS_EXPECTED 2 EOF cat >> confdefs.h <<\EOF @@ -1631,19 +1633,19 @@ EOF fi echo $ac_n "checking for gregset_t type""... $ac_c" 1>&6 -echo "configure:1635: checking for gregset_t type" >&5 +echo "configure:1637: checking for gregset_t type" >&5 if eval "test \"`echo '$''{'gdb_cv_have_gregset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { gregset_t *gregsetp = 0 ; return 0; } EOF -if { (eval echo configure:1647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gdb_cv_have_gregset_t=yes else @@ -1664,19 +1666,19 @@ EOF fi echo $ac_n "checking for fpregset_t type""... $ac_c" 1>&6 -echo "configure:1668: checking for fpregset_t type" >&5 +echo "configure:1670: checking for fpregset_t type" >&5 if eval "test \"`echo '$''{'gdb_cv_have_fpregset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { fpregset_t *fpregsetp = 0 ; return 0; } EOF -if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gdb_cv_have_fpregset_t=yes else @@ -1697,7 +1699,7 @@ EOF fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1701: checking for main in -lm" >&5 +echo "configure:1703: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1705,14 +1707,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1742,12 +1744,12 @@ fi echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6 -echo "configure:1746: checking for long long support in compiler" >&5 +echo "configure:1748: checking for long long support in compiler" >&5 if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gdb_cv_c_long_long=yes else @@ -1779,7 +1781,7 @@ fi echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6 -echo "configure:1783: checking for long long support in printf" >&5 +echo "configure:1785: checking for long long support in printf" >&5 if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1787,7 +1789,7 @@ else gdb_cv_printf_has_long_long=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then gdb_cv_printf_has_long_long=yes else @@ -1825,19 +1827,19 @@ echo "$ac_t""$gdb_cv_printf_has_long_long" 1>&6 echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6 -echo "configure:1829: checking for long double support in compiler" >&5 +echo "configure:1831: checking for long double support in compiler" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_long_double=yes else @@ -1859,7 +1861,7 @@ fi echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6 -echo "configure:1863: checking for long double support in printf" >&5 +echo "configure:1865: checking for long double support in printf" >&5 if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1867,7 +1869,7 @@ else gdb_cv_printf_has_long_double=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then gdb_cv_printf_has_long_double=yes else @@ -1901,7 +1903,7 @@ echo "$ac_t""$gdb_cv_printf_has_long_double" 1>&6 echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6 -echo "configure:1905: checking for long double support in scanf" >&5 +echo "configure:1907: checking for long double support in scanf" >&5 if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1909,7 +1911,7 @@ else gdb_cv_scanf_has_long_double=no else cat > conftest.$ac_ext < 3.14159 && f < 3.14160); } EOF -if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then gdb_cv_scanf_has_long_double=yes else @@ -1945,17 +1947,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1949: checking for $ac_hdr" >&5 +echo "configure:1951: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1984,12 +1986,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1988: checking for $ac_func" >&5 +echo "configure:1990: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2037,7 +2039,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2041: checking for working mmap" >&5 +echo "configure:2043: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2045,7 +2047,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2209,12 +2211,12 @@ fi echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6 -echo "configure:2213: checking whether malloc must be declared" >&5 +echo "configure:2215: checking whether malloc must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2235,7 +2237,7 @@ int main() { char *(*pfn) = (char *(*)) malloc ; return 0; } EOF -if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_malloc=no else @@ -2257,12 +2259,12 @@ EOF fi echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6 -echo "configure:2261: checking whether realloc must be declared" >&5 +echo "configure:2263: checking whether realloc must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2283,7 +2285,7 @@ int main() { char *(*pfn) = (char *(*)) realloc ; return 0; } EOF -if { (eval echo configure:2287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_realloc=no else @@ -2305,12 +2307,12 @@ EOF fi echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 -echo "configure:2309: checking whether free must be declared" >&5 +echo "configure:2311: checking whether free must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2331,7 +2333,7 @@ int main() { char *(*pfn) = (char *(*)) free ; return 0; } EOF -if { (eval echo configure:2335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_free=no else @@ -2359,7 +2361,7 @@ if test ${build} = ${host} -a ${host} = ${target} ; then case ${host_os} in hpux*) echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6 -echo "configure:2363: checking for HPUX/OSF thread support" >&5 +echo "configure:2365: checking for HPUX/OSF thread support" >&5 if test -f /usr/include/dce/cma_config.h ; then if test "$GCC" = "yes" ; then echo "$ac_t""yes" 1>&6 @@ -2377,7 +2379,7 @@ EOF ;; solaris*) echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6 -echo "configure:2381: checking for Solaris thread debugging library" >&5 +echo "configure:2383: checking for Solaris thread debugging library" >&5 if test -f /usr/lib/libthread_db.so.1 ; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -2386,7 +2388,7 @@ EOF CONFIG_OBS="${CONFIG_OBS} sol-thread.o" echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2390: checking for dlopen in -ldl" >&5 +echo "configure:2392: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2394,7 +2396,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2460,6 +2462,36 @@ if test "${enable_netrom}" = "yes"; then CONFIG_OBS="${CONFIG_OBS} remote-nrom.o" fi +MMALLOC_CFLAGS= +MMALLOC= + + + +# Check whether --with-mmalloc or --without-mmalloc was given. +if test "${with_mmalloc+set}" = set; then + withval="$with_mmalloc" + case "${withval}" in + yes) want_mmalloc=true ;; + no) want_mmalloc=false;; + *) { echo "configure: error: bad value ${withval} for GDB with-mmalloc option" 1>&2; exit 1; } ;; +esac +else + want_mmalloc=false +fi + +if test x$want_mmalloc = xtrue; then + cat >> confdefs.h <<\EOF +#define USE_MMALLOC 1 +EOF + + cat >> confdefs.h <<\EOF +#define FORCE_MMCHECK 1 +EOF + + MMALLOC_CFLAGS="-I$srcdir/../mmalloc" + MMALLOC='../mmalloc/libmmalloc.a' +fi + # start-sanitize-gdbtk ENABLE_IDE= # Check whether --enable-ide or --disable-ide was given. @@ -2513,12 +2545,12 @@ fi # In the cygwin32 environment, we need some additional flags. echo $ac_n "checking for cygwin32""... $ac_c" 1>&6 -echo "configure:2517: checking for cygwin32" >&5 +echo "configure:2549: checking for cygwin32" >&5 if eval "test \"`echo '$''{'gdb_cv_os_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:2575: checking for Tcl configuration" >&5 +echo "configure:2607: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2679,7 +2711,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 -echo "configure:2683: checking for Tk configuration" >&5 +echo "configure:2715: checking for Tk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2775,7 +2807,7 @@ fi no_tcl=true echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 -echo "configure:2779: checking for Tcl private headers. dir=${configdir}" >&5 +echo "configure:2811: checking for Tcl private headers. dir=${configdir}" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -2841,17 +2873,17 @@ fi if test x"${ac_cv_c_tclh}" = x ; then ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 -echo "configure:2845: checking for tclInt.h" >&5 +echo "configure:2877: checking for tclInt.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2911,7 +2943,7 @@ fi # no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 -echo "configure:2915: checking for Tk private headers" >&5 +echo "configure:2947: checking for Tk private headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -2977,17 +3009,17 @@ fi if test x"${ac_cv_c_tkh}" = x ; then ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 -echo "configure:2981: checking for tk.h" >&5 +echo "configure:3013: checking for tk.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3033,7 +3065,7 @@ fi echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:3037: checking for Itcl private headers. srcdir=${srcdir}" >&5 +echo "configure:3069: checking for Itcl private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itclh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do if test -f $i/src/itcl.h ; then @@ -3056,7 +3088,7 @@ fi echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:3060: checking for Tix private headers. srcdir=${srcdir}" >&5 +echo "configure:3092: checking for Tix private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_tixh}" = x ; then for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do if test -f $i/generic/tix.h ; then @@ -3268,7 +3300,7 @@ links="${links} nm.h" fi # start-sanitize-gdbtk echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3272: checking whether ln -s works" >&5 +echo "configure:3304: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3303,19 +3335,19 @@ fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:3307: checking for Cygwin32 environment" >&5 +echo "configure:3339: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -3332,19 +3364,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6 CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:3336: checking for Mingw32 environment" >&5 +echo "configure:3368: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -3363,7 +3395,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3367: checking for executable suffix" >&5 +echo "configure:3399: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3547,6 +3579,8 @@ s%@RANLIB@%$RANLIB%g s%@YACC@%$YACC%g s%@AWK@%$AWK%g s%@CONFIG_LDFLAGS@%$CONFIG_LDFLAGS%g +s%@MMALLOC_CFLAGS@%$MMALLOC_CFLAGS%g +s%@MMALLOC@%$MMALLOC%g s%@ENABLE_IDE@%$ENABLE_IDE%g s%@WIN32LIBS@%$WIN32LIBS%g s%@WIN32LDAPP@%$WIN32LDAPP%g diff --git a/gdb/configure.in b/gdb/configure.in index 5dcb025b8b5..438796e4536 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -73,7 +73,7 @@ AC_CHECK_FUNCS(setpgid sbrk select poll sigaction) if test "${target}" = "${host}"; then case "${host}" in i[[3456]]86-*-linux*) - AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,"2") + AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,2) AC_DEFINE(sys_quotactl) ;; esac @@ -250,6 +250,26 @@ if test "${enable_netrom}" = "yes"; then CONFIG_OBS="${CONFIG_OBS} remote-nrom.o" fi +MMALLOC_CFLAGS= +MMALLOC= +AC_SUBST(MMALLOC_CFLAGS) +AC_SUBST(MMALLOC) + +AC_ARG_WITH(mmalloc, +[ --with-mmalloc use memory mapped malloc package], +[case "${withval}" in + yes) want_mmalloc=true ;; + no) want_mmalloc=false;; + *) AC_MSG_ERROR(bad value ${withval} for GDB with-mmalloc option) ;; +esac],[want_mmalloc=false])dnl + +if test x$want_mmalloc = xtrue; then + AC_DEFINE(USE_MMALLOC) + AC_DEFINE(FORCE_MMCHECK) + MMALLOC_CFLAGS="-I$srcdir/../mmalloc" + MMALLOC='../mmalloc/libmmalloc.a' +fi + # start-sanitize-gdbtk ENABLE_IDE= AC_ARG_ENABLE(ide, [ --enable-ide Enable IDE support]) diff --git a/gdb/mpw-make.sed b/gdb/mpw-make.sed index b19526829e6..ce6a9ecdb15 100644 --- a/gdb/mpw-make.sed +++ b/gdb/mpw-make.sed @@ -16,7 +16,7 @@ /^MMALLOC_DIR = /s/::mmalloc/mmalloc:/ /^MMALLOC_SRC = /s/"{srcdir}"/"{topsrcdir}"/ /^MMALLOC =/s/=.*$/=/ -/MMALLOC_CFLAGS =/s/=.*$/= -d NO_MMALLOC/ +/MMALLOC_CFLAGS =/s/=.*$/= -u USE_MMALLOC/ /^BFD_DIR = /s/::bfd/bfd:/ /^BFD = /s/{BFD_DIR}:libbfd/{BFD_DIR}libbfd/ diff --git a/gdb/objfiles.c b/gdb/objfiles.c index f24bf59c879..31873d77c3a 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Prototypes for local functions */ -#if !defined(NO_MMALLOC) && defined(HAVE_MMAP) +#if defined(USE_MMALLOC) && defined(HAVE_MMAP) static int open_existing_mapped_file PARAMS ((char *, long, int)); @@ -48,7 +48,7 @@ open_mapped_file PARAMS ((char *filename, long mtime, int mapped)); static PTR map_to_file PARAMS ((int)); -#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */ +#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */ static void add_to_objfile_sections PARAMS ((bfd *, sec_ptr, PTR)); @@ -129,7 +129,7 @@ allocate_objfile (abfd, mapped) mapped |= mapped_symbol_files; -#if !defined(NO_MMALLOC) && defined(HAVE_MMAP) +#if defined(USE_MMALLOC) && defined(HAVE_MMAP) if (abfd != NULL) { @@ -212,7 +212,7 @@ allocate_objfile (abfd, mapped) bfd_get_filename (abfd)); } } -#else /* defined(NO_MMALLOC) || !defined(HAVE_MMAP) */ +#else /* !defined(USE_MMALLOC) || !defined(HAVE_MMAP) */ if (mapped) { @@ -225,7 +225,7 @@ allocate_objfile (abfd, mapped) mapped_symbol_files = 0; } -#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */ +#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */ /* If we don't support mapped symbol files, didn't ask for the file to be mapped, or failed to open the mapped file for some reason, then revert @@ -416,7 +416,7 @@ free_objfile (objfile) case. Note that the mmalloc_detach or the mfree is the last thing we can do with this objfile. */ -#if !defined(NO_MMALLOC) && defined(HAVE_MMAP) +#if defined(USE_MMALLOC) && defined(HAVE_MMAP) if (objfile -> flags & OBJF_MAPPED) { @@ -430,7 +430,7 @@ free_objfile (objfile) close (mmfd); } -#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */ +#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */ /* If we still have an objfile, then either we don't support reusable objfiles or this one was not reusable. So free it normally. */ @@ -712,7 +712,7 @@ have_minimal_symbols () return 0; } -#if !defined(NO_MMALLOC) && defined(HAVE_MMAP) +#if defined(USE_MMALLOC) && defined(HAVE_MMAP) /* Given the name of a mapped symbol file in SYMSFILENAME, and the timestamp of the corresponding symbol file in MTIME, try to open an existing file @@ -879,7 +879,7 @@ map_to_file (fd) return (md); } -#endif /* !defined(NO_MMALLOC) && defined(HAVE_MMAP) */ +#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */ /* Returns a section whose range includes PC and SECTION, or NULL if none found. Note the distinction between the return type,