---
 configure           |    2 ++
 configure.ac        |    2 ++
 lib-src/Makefile.in |    6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

--- configure.ac
+++ configure.ac	2014-10-21 13:50:36.287837811 +0000
@@ -1988,6 +1988,7 @@ system_malloc=$emacs_cv_sanitize_address
 case "$opsys" in
   ## darwin ld insists on the use of malloc routines in the System framework.
   darwin|sol2-10) system_malloc=yes ;;
+  gnu-linux) system_malloc=yes ;;
 esac
 
 GMALLOC_OBJ=
@@ -2045,6 +2046,7 @@ fi
 use_mmap_for_buffers=no
 case "$opsys" in
   cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+  gnu-linux) use_mmap_for_buffers=yes ;;
 esac
 
 AC_FUNC_MMAP
--- configure
+++ configure	2014-10-21 13:51:36.143837910 +0000
@@ -10862,6 +10862,7 @@ system_malloc=$emacs_cv_sanitize_address
 case "$opsys" in
   ## darwin ld insists on the use of malloc routines in the System framework.
   darwin|sol2-10) system_malloc=yes ;;
+  gnu-linux) system_malloc=yes ;;
 esac
 
 GMALLOC_OBJ=
@@ -10949,6 +10950,7 @@ fi
 use_mmap_for_buffers=no
 case "$opsys" in
   cygwin|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+  gnu-linux) use_mmap_for_buffers=yes ;;
 esac