raspi/userland
1
0
Fork 0
mirror of https://github.com/raspberrypi/userland.git synced 2025-12-06 04:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Test for the existence of execinfo.h

Browse Source 
Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension.
This change fixes building the library under buildroot, which uses uClibc by default
This commit is contained in:
Floris Bos
2012-11-25 19:05:07 +01:00
parent 83e1597d57
commit 93ae1bcd80
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
interface/vcos/glibc/vcos_backtrace.c
View File

@@ -26,7 +26,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <interface/vcos/vcos.h> #include <interface/vcos/vcos.h>
#ifdef __linux__ #ifdef HAVE_CMAKE_CONFIG
#include "cmake_config.h"
#endif
#ifdef HAVE_EXECINFO_H
#include <execinfo.h> #include <execinfo.h>
#endif #endif
#include <stdio.h> #include <stdio.h>
@@ -35,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
void vcos_backtrace_self(void) void vcos_backtrace_self(void)
{ {
#ifdef __linux__ #ifdef HAVE_EXECINFO_H
void *stack[64]; void *stack[64];
int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0])); int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
char **names = backtrace_symbols(stack, depth); char **names = backtrace_symbols(stack, depth);

4
makefiles/cmake/arm-linux.cmake
View File

@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE
${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c
OUTPUT_VARIABLE foo) OUTPUT_VARIABLE foo)
# test for existence of execinfo.h header
include(CheckIncludeFile)
check_include_file(execinfo.h HAVE_EXECINFO_H)
add_definitions(-DHAVE_CMAKE_CONFIG) add_definitions(-DHAVE_CMAKE_CONFIG)
configure_file ( configure_file (
"makefiles/cmake/cmake_config.h.in" "makefiles/cmake/cmake_config.h.in"

3
makefiles/cmake/cmake_config.h.in
View File

@@ -8,5 +8,8 @@
/** Do we have support for GLIBC mtrace() ? */ /** Do we have support for GLIBC mtrace() ? */
#cmakedefine HAVE_MTRACE #cmakedefine HAVE_MTRACE
/** Do we have the execinfo.h include file ? */
#cmakedefine HAVE_EXECINFO_H
#endif #endif