mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: improve generated source compatibility with latest Alpine (lacking libexecinfo-dev and execinfo.h) and the prebuilt tcc (#16743)

Browse Source
This commit is contained in:
Delyan Angelov 2022-12-22 15:01:51 +02:00 committed by GitHub
parent e519bdf0eb
commit 3da4f37b01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/builtin/builtin_nix.c.v
View File

@ -75,7 +75,7 @@ fn print_backtrace_skipping_top_frames_linux(skipframes int) bool {
$if tinyc { $if tinyc {
C.tcc_backtrace(c'Backtrace') C.tcc_backtrace(c'Backtrace')
return false return false
} } $else {
buffer := [100]voidptr{} buffer := [100]voidptr{}
nr_ptrs := C.backtrace(&buffer[0], 100) nr_ptrs := C.backtrace(&buffer[0], 100)
if nr_ptrs < 2 { if nr_ptrs < 2 {
@ -124,6 +124,7 @@ fn print_backtrace_skipping_top_frames_linux(skipframes int) bool {
} }
} }
} }
}
return true return true
} }

20
vlib/v/gen/c/cheaders.v
View File

@ -318,6 +318,17 @@ const c_common_macros = '
#define EMPTY_STRUCT_INITIALIZATION 0 #define EMPTY_STRUCT_INITIALIZATION 0
#endif #endif
#ifndef _WIN32
#if defined __has_include
#if __has_include (<execinfo.h>)
#include <execinfo.h>
#else
// On linux: int backtrace(void **__array, int __size);
// On BSD: size_t backtrace(void **, size_t);
#endif
#endif
#endif
#ifdef __TINYC__ #ifdef __TINYC__
#define _Atomic volatile #define _Atomic volatile
#undef EMPTY_STRUCT_DECLARATION #undef EMPTY_STRUCT_DECLARATION
@ -333,7 +344,6 @@ const c_common_macros = '
#define TCCSKIP(x) #define TCCSKIP(x)
// #include <byteswap.h> // #include <byteswap.h>
#ifndef _WIN32 #ifndef _WIN32
#include <execinfo.h>
int tcc_backtrace(const char *fmt, ...); int tcc_backtrace(const char *fmt, ...);
#endif #endif
#endif #endif
@ -501,14 +511,6 @@ typedef int (*qsort_callback_func)(const void*, const void*);
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifndef _WIN32
#if defined __has_include
#if __has_include (<execinfo.h>)
#include <execinfo.h>
#endif
#endif
#endif
#include <stdarg.h> // for va_list #include <stdarg.h> // for va_list
//================================== GLOBALS =================================*/ //================================== GLOBALS =================================*/