Force `memalign()` on i386 Linux when alignment < 16 (fixes #4432)
This commit is contained in:
parent
e63e583c7e
commit
c73844d722
|
@ -103,6 +103,9 @@ if(HAVE_X86_SSE_MATH)
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# On i386 Linux we can fix unaligned SSE malloc (see GitHub issue #4432)
|
||||||
|
include(FindUnalignedMalloc)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
# Add additional paths. Look in the MinGW path first, then in the Gtkmm path.
|
# Add additional paths. Look in the MinGW path first, then in the Gtkmm path.
|
||||||
# If you wish to build some dependent libraries, you have to install them in MinGW to use them:
|
# If you wish to build some dependent libraries, you have to install them in MinGW to use them:
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
# This file is part of RawTherapee.
|
||||||
|
#
|
||||||
|
# Copyright (C) 2018 Flössie <floessie.mail@gmail.com>
|
||||||
|
#
|
||||||
|
# RawTherapee is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# RawTherapee is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
include(CheckCXXSourceCompiles)
|
||||||
|
|
||||||
|
set(CMAKE_REQUIRED_QUIET_COPY "${CMAKE_REQUIRED_QUIET}")
|
||||||
|
set(CMAKE_REQUIRED_QUIET ON)
|
||||||
|
|
||||||
|
set(TEST_SOURCE
|
||||||
|
"
|
||||||
|
#include <cstddef>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
#if defined(__SSE2__) && (defined(__i386) || defined(_M_IX86)) && defined(__linux)
|
||||||
|
static_assert(std::alignment_of<std::max_align_t>::value >= 16, \"Unaligned heap objects possible\");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
")
|
||||||
|
|
||||||
|
CHECK_CXX_SOURCE_COMPILES("${TEST_SOURCE}" HAVE_ALIGNED_MALLOC)
|
||||||
|
|
||||||
|
if(NOT HAVE_ALIGNED_MALLOC)
|
||||||
|
set(HAVE_UNALIGNED_MALLOC 1)
|
||||||
|
else()
|
||||||
|
unset(HAVE_ALIGNED_MALLOC)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
unset(TEST_SOURCE)
|
||||||
|
|
||||||
|
set(CMAKE_REQUIRED_QUIET "${CMAKE_REQUIRED_QUIET_COPY}")
|
||||||
|
unset(CMAKE_REQUIRED_QUIET_COPY)
|
|
@ -1,5 +1,6 @@
|
||||||
# Common source files for both CLI and non-CLI execautables
|
# Common source files for both CLI and non-CLI execautables
|
||||||
set(CLISOURCEFILES
|
set(CLISOURCEFILES
|
||||||
|
alignedmalloc.cc
|
||||||
edit.cc
|
edit.cc
|
||||||
main-cli.cc
|
main-cli.cc
|
||||||
multilangmgr.cc
|
multilangmgr.cc
|
||||||
|
@ -11,6 +12,7 @@ set(CLISOURCEFILES
|
||||||
|
|
||||||
set(NONCLISOURCEFILES
|
set(NONCLISOURCEFILES
|
||||||
adjuster.cc
|
adjuster.cc
|
||||||
|
alignedmalloc.cc
|
||||||
batchqueue.cc
|
batchqueue.cc
|
||||||
batchqueuebuttonset.cc
|
batchqueuebuttonset.cc
|
||||||
batchqueueentry.cc
|
batchqueueentry.cc
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
/*
|
||||||
|
* This file is part of RawTherapee.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2018 Flössie <floessie.mail@gmail.com>
|
||||||
|
*
|
||||||
|
* RawTherapee is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* RawTherapee is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_UNALIGNED_MALLOC
|
||||||
|
|
||||||
|
#include <malloc.h>
|
||||||
|
|
||||||
|
void* malloc(size_t size)
|
||||||
|
{
|
||||||
|
return memalign(16, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -21,6 +21,7 @@
|
||||||
#define __CONFIG_H__
|
#define __CONFIG_H__
|
||||||
|
|
||||||
#cmakedefine BUILD_BUNDLE
|
#cmakedefine BUILD_BUNDLE
|
||||||
|
#cmakedefine HAVE_UNALIGNED_MALLOC
|
||||||
#define DATA_SEARCH_PATH "${DATADIR}"
|
#define DATA_SEARCH_PATH "${DATADIR}"
|
||||||
#define DOC_SEARCH_PATH "${DOCDIR}"
|
#define DOC_SEARCH_PATH "${DOCDIR}"
|
||||||
#define CREDITS_SEARCH_PATH "${CREDITSDIR}"
|
#define CREDITS_SEARCH_PATH "${CREDITSDIR}"
|
||||||
|
|
Loading…
Reference in New Issue