nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse Source
This commit is contained in:
Nick Mathewson 2018-08-03 07:33:45 -04:00
commit ae157b79e7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug20424_029_minimal Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell
the compiler not to include the system malloc implementation. Fixes bug
20424; bugfix on 0.2.0.20-rc.

4
configure.ac
View File

@ -1807,6 +1807,10 @@ fi
if test "$using_custom_malloc" = "no"; then if test "$using_custom_malloc" = "no"; then
AC_CHECK_FUNCS(mallinfo) AC_CHECK_FUNCS(mallinfo)
fi fi
if test "$using_custom_malloc" = "yes"; then
# Tell the C compiler not to use the system allocator functions.
TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc -fno-builtin-calloc -fno-builtin-free])
fi
# By default, we're going to assume we don't have mlockall() # By default, we're going to assume we don't have mlockall()
# bionic and other platforms have various broken mlockall subsystems. # bionic and other platforms have various broken mlockall subsystems.