Merge branch 'master' into jgrpp

# Conflicts:
#	config.lib
This commit is contained in:
Jonathan G Rennison
2016-06-02 19:25:23 +01:00
6 changed files with 46 additions and 22 deletions

View File

@@ -1428,6 +1428,12 @@ make_compiler_cflags() {
CFLAGS="$CFLAGS -DCUSTOM_ALLOCATOR"
fi
if [ $cc_version -ge 60 ]; then
# -flifetime-dse=2 (default since GCC 6) doesn't play
# well with our custom pool item allocator
cxxflags="$cxxflags -flifetime-dse=1"
fi
if [ "$enable_lto" != "0" ]; then
# GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
has_lto=`$1 -dumpspecs | grep '\%{flto'`