1 new commit in XEmacs: https://bitbucket.org/xemacs/xemacs/commits/3130df547aa4/ Changeset: 3130df547aa4 User: kehoea Date: 2017-11-07 06:45:00+00:00 Summary: 2017-11-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; * configure.ac (XE_COMPLEX_ARG): Document that we default to the system malloc. * configure.ac: Implement this. Use src/gmalloc.c if --with-system-malloc=no was supplied, otherwise use the system malloc. Document that the right next step is to remove src/gmalloc.c, and to use __after_morecore_hook and malloc_set_state if those are available in the system malloc, not otherwise. * configure: Regenerate. Affected #: 3 files diff -r 92495f148d48c7e2fdfe53d7180fa14766e2afce -r 3130df547aa49dfcff4e7592d62613045471d3aa ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,16 ＠＠ +2017-11-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * configure.ac (XE_COMPLEX_ARG): + Document that we default to the system malloc. + * configure.ac: + Implement this. Use src/gmalloc.c if --with-system-malloc=no was + supplied, otherwise use the system malloc. + Document that the right next step is to remove src/gmalloc.c, and + to use __after_morecore_hook and malloc_set_state if those are + available in the system malloc, not otherwise. + * configure: + Regenerate. + 2017-03-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; * ChangeLog: diff -r 92495f148d48c7e2fdfe53d7180fa14766e2afce -r 3130df547aa49dfcff4e7592d62613045471d3aa configure --- a/configure +++ b/configure ＠＠ -824,6 +824,7 ＠＠ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir ＠＠ -1110,6 +1111,7 ＠＠ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ＠＠ -1362,6 +1364,15 ＠＠ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ＠＠ -1499,7 +1510,7 ＠＠ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. ＠＠ -1652,6 +1663,7 ＠＠ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] ＠＠ -1960,8 +1972,7 ＠＠ --with-rel-alloc Enable the relocating allocator. --with-dlmalloc Use Doug Lea's malloc implementation. - --with-system-malloc Use the system malloc, not the one distributed with - XEmacs. + --with-system-malloc Use the system malloc, (default). --with-debug-malloc Use a debugging malloc. --with-pdump Enable portable LISP preloader. --with-dump-in-exec Enable dumping into executable (enabled by default ＠＠ -10266,33 +10277,20 ＠＠ -case "$opsys" in - darwin ) - if test "$with_system_malloc" = "default"; then - system_malloc=yes - with_system_malloc=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Forcing system malloc on Darwin." >&5 -$as_echo "$as_me: WARNING: Forcing system malloc on Darwin." >&2;} - fi ;; -esac - -GNU_MALLOC=yes -if test "$with_dlmalloc" != "no"; then - doug_lea_malloc=yes -else - doug_lea_malloc=no -fi -after_morecore_hook_exists=yes -ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state" + +if test "$with_dlmalloc" = "yes"; then + ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state" if test "x$ac_cv_func_malloc_set_state" = xyes; then : - + doug_lea_malloc=yes else doug_lea_malloc=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5 + if test "$doug_lea_malloc" = "yes"; then + system_malloc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5 $as_echo_n "checking whether __after_morecore_hook exists... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern void (* __after_morecore_hook)(); int ＠＠ -10306,38 +10304,45 ＠＠ if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - after_morecore_hook_exists=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$system_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - The GNU allocators don't work with this system configuration." -elif test "$with_system_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - User chose not to use GNU allocators." + after_morecore_hook_exists=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + after_morecore_hook_exists=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + GNU_MALLOC=yes + $as_echo "#define DOUG_LEA_MALLOC 1" >>confdefs.h + + if test "$after_morecore_hook_exists" = "no" ; then + GNU_MALLOC_reason=" + - Using Doug Lea's new malloc from the Linux C Library." + $as_echo "#define _NO_MALLOC_WARNING_ 1" >>confdefs.h + + else + GNU_MALLOC_reason=" + - Using Doug Lea's new malloc from the GNU C Library." + fi + else + system_malloc=yes + fi elif test "$with_debug_malloc" = "yes" ; then + debug_malloc=yes + system_malloc=yes GNU_MALLOC=no GNU_MALLOC_reason=" - User chose to use Debugging Malloc." -fi - -if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then +elif test "$with_system_malloc" = "no" ; then + GNU_MALLOC=yes GNU_MALLOC_reason=" - - Using Doug Lea's new malloc from the GNU C Library." - $as_echo "#define DOUG_LEA_MALLOC 1" >>confdefs.h - - if test "$after_morecore_hook_exists" = "no" ; then - GNU_MALLOC_reason=" - - Using Doug Lea's new malloc from the Linux C Library." - $as_echo "#define _NO_MALLOC_WARNING_ 1" >>confdefs.h - - fi + - System malloc explicitly overridden." + system_malloc=no +else + GNU_MALLOC=no + GNU_MALLOC_reason=" + - Defaulting to system malloc." + system_malloc=yes fi ＠＠ -11821,7 +11826,7 ＠＠ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; ＠＠ -11867,7 +11872,7 ＠＠ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; ＠＠ -11891,7 +11896,7 ＠＠ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; ＠＠ -11936,7 +11941,7 ＠＠ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; ＠＠ -11960,7 +11965,7 ＠＠ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; ＠＠ -22069,11 +22074,11 ＠＠ -if test "$with_system_malloc" = "yes"; then $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h - -elif test "$with_debug_malloc" = "yes"; then $as_echo "#define USE_DEBUG_MALLOC 1" >>confdefs.h - - $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h +if test "$debug_malloc" = "yes"; then $as_echo "#define USE_DEBUG_MALLOC 1" >>confdefs.h + + $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h + +elif test "$system_malloc" = "yes"; then $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h fi test "$GCC" = "yes" && $as_echo "#define USE_GCC 1" >>confdefs.h ＠＠ -22182,7 +22187,7 ＠＠ fi echo " libc version: $libc_version" echo " Relocating allocator for buffers: $with_rel_alloc" -echo " GNU version of malloc: ${GNU_MALLOC}${GNU_MALLOC_reason}" +echo " Using gmalloc.c from XEmacs: ${GNU_MALLOC}${GNU_MALLOC_reason}" case "$ld_switch_site" in *nocombreloc*) echo " Linking with \`-z nocombreloc'. - Consider configuring with --with-pdump." ;; diff -r 92495f148d48c7e2fdfe53d7180fa14766e2afce -r 3130df547aa49dfcff4e7592d62613045471d3aa configure.ac --- a/configure.ac +++ b/configure.ac ＠＠ -973,7 +973,7 ＠＠ AS_HELP_STRING([--with-dlmalloc],[Use Doug Lea's malloc implementation.]), [], [with_dlmalloc='default']) XE_MERGED_ARG([system-malloc], - AS_HELP_STRING([--with-system-malloc],[Use the system malloc, not the one distributed with XEmacs.]), + AS_HELP_STRING([--with-system-malloc],[Use the system malloc, (default).]), [], [with_system_malloc='default']) XE_MERGED_ARG([debug-malloc], AS_HELP_STRING([--with-debug-malloc],[Use a debugging malloc.]), ＠＠ -2533,56 +2533,51 ＠＠ dnl Do some misc autoconf-special tests dnl ----------------------------------- -dnl Can we use GNU malloc on this system? -dnl First, configure based-checks. -case "$opsys" in - darwin ) - if test "$with_system_malloc" = "default"; then - system_malloc=yes - with_system_malloc=yes - AC_MSG_WARN([Forcing system malloc on Darwin.]) - fi ;; -esac - -dnl Do the opsystem or machine files prohibit the use of the GNU malloc? -dnl Assume not, until told otherwise. -GNU_MALLOC=yes -if test "$with_dlmalloc" != "no"; then - doug_lea_malloc=yes -else - doug_lea_malloc=no -fi -after_morecore_hook_exists=yes -AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no) -AC_MSG_CHECKING(whether __after_morecore_hook exists) -AC_LINK_IFELSE([AC_LANG_PROGRAM([extern void (* __after_morecore_hook)();], - [__after_morecore_hook = 0])], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no) - after_morecore_hook_exists=no]) -if test "$system_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - The GNU allocators don't work with this system configuration." -elif test "$with_system_malloc" = "yes" ; then - GNU_MALLOC=no - GNU_MALLOC_reason=" - - User chose not to use GNU allocators." +dnl Default to the system malloc. The right thing here is to remove +dnl src/gmalloc.c entirely, and just autoconfiscate and use malloc_set_state +dnl and __after_morecore_hook and if they are available, otherwise no. But +dnl this is a reasonable first step. + +if test "$with_dlmalloc" = "yes"; then + AC_CHECK_FUNC(malloc_set_state, doug_lea_malloc=yes,doug_lea_malloc=no) + if test "$doug_lea_malloc" = "yes"; then + system_malloc=no + AC_MSG_CHECKING(whether __after_morecore_hook exists) + AC_LINK_IFELSE([AC_LANG_PROGRAM([extern void (* __after_morecore_hook)();], + [__after_morecore_hook = 0])], + [AC_MSG_RESULT(yes) + after_morecore_hook_exists=yes], + [AC_MSG_RESULT(no) + after_morecore_hook_exists=no]) + GNU_MALLOC=yes + AC_DEFINE(DOUG_LEA_MALLOC) + if test "$after_morecore_hook_exists" = "no" ; then + GNU_MALLOC_reason=" + - Using Doug Lea's new malloc from the Linux C Library." + AC_DEFINE(_NO_MALLOC_WARNING_) + else + GNU_MALLOC_reason=" + - Using Doug Lea's new malloc from the GNU C Library." + fi + else + system_malloc=yes + fi elif test "$with_debug_malloc" = "yes" ; then + debug_malloc=yes + system_malloc=yes GNU_MALLOC=no GNU_MALLOC_reason=" - User chose to use Debugging Malloc." -fi - -if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then +elif test "$with_system_malloc" = "no" ; then + GNU_MALLOC=yes GNU_MALLOC_reason=" - - Using Doug Lea's new malloc from the GNU C Library." - AC_DEFINE(DOUG_LEA_MALLOC) - if test "$after_morecore_hook_exists" = "no" ; then - GNU_MALLOC_reason=" - - Using Doug Lea's new malloc from the Linux C Library." - AC_DEFINE(_NO_MALLOC_WARNING_) - fi + - System malloc explicitly overridden." + system_malloc=no +else + GNU_MALLOC=no + GNU_MALLOC_reason=" + - Defaulting to system malloc." + system_malloc=yes fi dnl #### mcheck is broken in all versions of Linux libc and glibc. ＠＠ -5830,9 +5825,9 ＠＠ dnl so that the user gets immediate feedback on the results of the dnl autodetection. -if test "$with_system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC) -elif test "$with_debug_malloc" = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC) - AC_DEFINE(USE_SYSTEM_MALLOC) +if test "$debug_malloc" = "yes"; then AC_DEFINE(USE_DEBUG_MALLOC) + AC_DEFINE(USE_SYSTEM_MALLOC) +elif test "$system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC) fi test "$GCC" = "yes" && AC_DEFINE(USE_GCC) test "$XEMACS_CC_GPP" = "yes" && AC_DEFINE(USE_GPLUSPLUS) ＠＠ -5931,7 +5926,7 ＠＠ fi echo " libc version: $libc_version" echo " Relocating allocator for buffers: $with_rel_alloc" -echo " GNU version of malloc: ${GNU_MALLOC}${GNU_MALLOC_reason}" +echo " Using gmalloc.c from XEmacs: ${GNU_MALLOC}${GNU_MALLOC_reason}" case "$ld_switch_site" in *nocombreloc*) echo " Linking with \`-z nocombreloc'. - Consider configuring with --with-pdump." ;; Repository URL: https://bitbucket.org/xemacs/xemacs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.