diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-09-16 15:28:49 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-09-16 15:30:15 +0000 |
| commit | 23fdf4b4f0d2f02b96ba7ff03f9a3a4b051ca74a (patch) | |
| tree | b534d2cfb31ae8be1c8e90dba4486c9bf0f769fd /community/chromium/musl-fixes.patch | |
| parent | 7c3c04c6f4bb36a87d4c23831db04cadf01dd800 (diff) | |
| download | aports-23fdf4b4f0d2f02b96ba7ff03f9a3a4b051ca74a.tar.bz2 aports-23fdf4b4f0d2f02b96ba7ff03f9a3a4b051ca74a.tar.xz | |
community/chromium: armhf fixes
Diffstat (limited to 'community/chromium/musl-fixes.patch')
| -rw-r--r-- | community/chromium/musl-fixes.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch index 9d9d6ae82d..84dbc3825d 100644 --- a/community/chromium/musl-fixes.patch +++ b/community/chromium/musl-fixes.patch @@ -154,3 +154,53 @@ index 10f1c0d..8e86a2e 100644 defined(OS_FUCHSIA) pthread_attr_t attr; int error; +--- third_party/lss/linux_syscall_support.h.orig ++++ third_party/lss/linux_syscall_support.h +@@ -132,15 +132,18 @@ + + /* The Android NDK's <sys/stat.h> #defines these macros as aliases + * to their non-64 counterparts. To avoid naming conflict, remove them. */ +-#ifdef __ANDROID__ ++#if defined(fstat64) + /* These are restored by the corresponding #pragma pop_macro near + * the end of this file. */ + # pragma push_macro("stat64") + # pragma push_macro("fstat64") ++# pragma push_macro("fstatat64") + # pragma push_macro("lstat64") + # undef stat64 + # undef fstat64 ++# undef fstatat64 + # undef lstat64 ++# define __RESTORE_MACRO 1 + #endif + + #if defined(__ANDROID__) && defined(__x86_64__) +@@ -4545,12 +4548,14 @@ + # endif + #endif + +-#ifdef __ANDROID__ ++#ifdef __RESTORE_MACRO + /* These restore the original values of these macros saved by the + * corresponding #pragma push_macro near the top of this file. */ + # pragma pop_macro("stat64") + # pragma pop_macro("fstat64") ++# pragma pop_macro("fstatat64") + # pragma pop_macro("lstat64") ++#undef __RESTORE_MACRO + #endif + + #if defined(__cplusplus) && !defined(SYS_CPLUSPLUS) +--- third_party/crashpad/crashpad/util/linux/ptracer.cc.orig ++++ third_party/crashpad/crashpad/util/linux/ptracer.cc +@@ -28,6 +28,9 @@ + #include <asm/ldt.h> + #include <asm/ptrace-abi.h> + #endif ++#if defined(ARCH_CPU_ARM_FAMILY) ++#include <asm/ptrace.h> ++#endif + + namespace crashpad { + |