mirror of
https://github.com/mauiaaron/apple2.git
synced 2024-06-18 03:29:31 +00:00
Get our copy of breakpad, such as it is, building against NDK R15C
- Likely we should "soon" upgrade breakpad/crashpad and the NDK to a mutually agreed-upon version
This commit is contained in:
parent
43d99ec9f4
commit
1c022c9587
|
@ -96,7 +96,7 @@ LOCAL_SRC_FILES := \
|
||||||
|
|
||||||
# Embedded stackwalker sources (to be able to process crashes in-situ on Android device)
|
# Embedded stackwalker sources (to be able to process crashes in-situ on Android device)
|
||||||
ifeq ($(EMBEDDED_STACKWALKER),1)
|
ifeq ($(EMBEDDED_STACKWALKER),1)
|
||||||
LOCAL_CPPFLAGS += -DEMBEDDED_STACKWALKER=1 -frtti
|
LOCAL_CPPFLAGS += -DAPPLE2IX -DEMBEDDED_STACKWALKER=1 -frtti
|
||||||
LOCAL_SRC_FILES += \
|
LOCAL_SRC_FILES += \
|
||||||
src/processor/basic_code_modules.cc \
|
src/processor/basic_code_modules.cc \
|
||||||
src/processor/basic_source_line_resolver.cc \
|
src/processor/basic_source_line_resolver.cc \
|
||||||
|
|
|
@ -106,7 +106,12 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// A wrapper for the tgkill syscall: send a signal to a specific thread.
|
// A wrapper for the tgkill syscall: send a signal to a specific thread.
|
||||||
|
#if APPLE2IX
|
||||||
|
#define tgkill _tgkill
|
||||||
|
static int _tgkill(pid_t tgid, pid_t tid, int sig) {
|
||||||
|
#else
|
||||||
static int tgkill(pid_t tgid, pid_t tid, int sig) {
|
static int tgkill(pid_t tgid, pid_t tid, int sig) {
|
||||||
|
#endif
|
||||||
return syscall(__NR_tgkill, tgid, tid, sig);
|
return syscall(__NR_tgkill, tgid, tid, sig);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
|
||||||
|
#if !APPLE2IX
|
||||||
struct r_debug {
|
struct r_debug {
|
||||||
int r_version;
|
int r_version;
|
||||||
struct link_map* r_map;
|
struct link_map* r_map;
|
||||||
|
@ -61,6 +62,7 @@ struct link_map {
|
||||||
struct link_map* l_next;
|
struct link_map* l_next;
|
||||||
struct link_map* l_prev;
|
struct link_map* l_prev;
|
||||||
};
|
};
|
||||||
|
#endif // !APPLE2IX
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|
|
@ -46,7 +46,9 @@
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
#if !APPLE2IX
|
||||||
typedef struct user_fxsr_struct user_fpxregs_struct;
|
typedef struct user_fxsr_struct user_fpxregs_struct;
|
||||||
|
#endif // !APPLE2IX
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
@ -56,6 +58,7 @@ typedef struct user_fxsr_struct user_fpxregs_struct;
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
#if !APPLE2IX
|
||||||
struct user_regs_struct {
|
struct user_regs_struct {
|
||||||
__u64 regs[31];
|
__u64 regs[31];
|
||||||
__u64 sp;
|
__u64 sp;
|
||||||
|
@ -67,6 +70,7 @@ struct user_fpsimd_struct {
|
||||||
__u32 fpsr;
|
__u32 fpsr;
|
||||||
__u32 fpcr;
|
__u32 fpcr;
|
||||||
};
|
};
|
||||||
|
#endif // !APPLE2IX
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
|
Loading…
Reference in New Issue
Block a user