diff options
Diffstat (limited to 'community/chromium/musl-fixes.patch')
| -rw-r--r-- | community/chromium/musl-fixes.patch | 103 |
1 files changed, 39 insertions, 64 deletions
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch index 7f851971ca..b776d1d394 100644 --- a/community/chromium/musl-fixes.patch +++ b/community/chromium/musl-fixes.patch @@ -1,6 +1,6 @@ ---- ./third_party/lss/linux_syscall_support.h.orig +--- ./third_party/lss/linux_syscall_support.h +++ ./third_party/lss/linux_syscall_support.h -@@ -1127,6 +1127,12 @@ +@@ -1239,6 +1239,12 @@ #ifndef __NR_fallocate #define __NR_fallocate 285 #endif @@ -13,10 +13,10 @@ /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 ---- ./sandbox/linux/suid/process_util.h.orig +--- ./sandbox/linux/suid/process_util.h +++ ./sandbox/linux/suid/process_util.h -@@ -11,6 +11,14 @@ - #include <stdbool.h> +@@ -12,6 +12,14 @@ + #include <stdint.h> #include <sys/types.h> +// Some additional functions @@ -30,9 +30,9 @@ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer // will prefer certain process types over others. The range for the // adjustment is [-1000, 1000], with [0, 1000] being user accessible. ---- ./sandbox/linux/seccomp-bpf/trap.cc.orig +--- ./sandbox/linux/seccomp-bpf/trap.cc +++ ./sandbox/linux/seccomp-bpf/trap.cc -@@ -156,7 +156,7 @@ +@@ -168,7 +168,7 @@ // most versions of glibc don't include this information in siginfo_t. So, // we need to explicitly copy it into a arch_sigsys structure. struct arch_sigsys sigsys; @@ -41,9 +41,9 @@ #if defined(__mips__) // When indirect syscall (syscall(__NR_foo, ...)) is made on Mips, the ---- ./third_party/ffmpeg/libavutil/cpu.c.orig +--- ./third_party/ffmpeg/libavutil/cpu.c +++ ./third_party/ffmpeg/libavutil/cpu.c -@@ -38,7 +38,6 @@ +@@ -41,7 +41,6 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -51,11 +51,9 @@ #endif #if HAVE_UNISTD_H #include <unistd.h> -diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -index 9067e84..1c47b2a 100644 --- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -39,7 +39,9 @@ +@@ -46,7 +46,9 @@ #endif // defined(OS_ANDROID) && defined(__arm__) #if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -65,40 +63,18 @@ index 9067e84..1c47b2a 100644 #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -295,7 +297,7 @@ void RecordLinuxDistro() { - #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +@@ -255,7 +257,7 @@ + shell_integration::NUM_DEFAULT_STATES); + } - void RecordLinuxGlibcVersion() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(__GLIBC__) && !defined(OS_CHROMEOS) - base::Version version(gnu_get_libc_version()); - - UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE; ---- ./services/device/serial/serial_io_handler_posix.cc.orig -+++ ./services/device/serial/serial_io_handler_posix.cc -@@ -6,6 +6,7 @@ - - #include <sys/ioctl.h> - #include <termios.h> -+#include <asm-generic/ioctls.h> - - #include "base/posix/eintr_wrapper.h" - -diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h -index a80ea16..55a2abf 100644 ---- third_party/ots/include/opentype-sanitiser.h -+++ third_party/ots/include/opentype-sanitiser.h -@@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t; - #define htonl(x) _byteswap_ulong (x) - #define htons(x) _byteswap_ushort (x) - #else -+#include <sys/types.h> - #include <arpa/inet.h> - #include <stdint.h> - #endif ---- ./base/logging.cc.orig + void RecordLinuxDistro() { + UMALinuxDistro distro_result = UMA_LINUX_DISTRO_UNKNOWN; + +--- ./base/logging.cc +++ ./base/logging.cc -@@ -545,8 +545,7 @@ +@@ -621,8 +621,7 @@ LogMessage::~LogMessage() { size_t stack_start = stream_.tellp(); @@ -107,36 +83,34 @@ index a80ea16..55a2abf 100644 +#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { // Include a stack trace on a fatal, unless a debugger is attached. - base::debug::StackTrace trace; ---- ./net/dns/dns_config_service_posix.cc.orig + base::debug::StackTrace stack_trace; +--- ./net/dns/dns_config_service_posix.cc +++ ./net/dns/dns_config_service_posix.cc -@@ -122,7 +122,7 @@ +@@ -150,7 +150,7 @@ + #if !defined(OS_ANDROID) ConfigParsePosixResult result; - config->unhandled_options = false; // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia. -#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) +#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || defined(_GNU_SOURCE) // Note: res_ninit in glibc always returns 0 and sets RES_INIT. // res_init behaves the same way. memset(&_res, 0, sizeof(_res)); ---- base/native_library_posix.cc.orig 2016-11-17 01:45:50.032002326 +0100 -+++ base/native_library_posix.cc 2016-11-17 01:46:23.729001549 +0100 +--- base/native_library_posix.cc ++++ base/native_library_posix.cc @@ -12,6 +12,10 @@ #include "base/strings/utf_string_conversions.h" - #include "base/threading/thread_restrictions.h" - + #include "base/threading/scoped_blocking_call.h" + +#ifndef RTLD_DEEPBIND +#define RTLD_DEEPBIND 0 +#endif + namespace base { - + std::string NativeLibraryLoadError::ToString() const { -diff --git ./third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc -index 10f1c0d..8e86a2e 100644 --- ./third_party/blink/renderer/platform/wtf/stack_util.cc +++ ./third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { +@@ -29,7 +29,7 @@ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. @@ -144,8 +118,8 @@ index 10f1c0d..8e86a2e 100644 +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ defined(OS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). -@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() { + // pthread_create() (e.g., the main thread of blink_unittests). +@@ -97,7 +97,7 @@ } void* GetStackStart() { @@ -154,7 +128,7 @@ 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 +++ third_party/lss/linux_syscall_support.h @@ -132,15 +132,18 @@ @@ -176,7 +150,7 @@ index 10f1c0d..8e86a2e 100644 #endif #if defined(__ANDROID__) && defined(__x86_64__) -@@ -4545,12 +4548,14 @@ +@@ -4517,12 +4518,14 @@ # endif #endif @@ -192,21 +166,22 @@ index 10f1c0d..8e86a2e 100644 #endif #if defined(__cplusplus) && !defined(SYS_CPLUSPLUS) ---- third_party/crashpad/crashpad/util/linux/ptracer.cc.orig +--- third_party/crashpad/crashpad/util/linux/ptracer.cc +++ third_party/crashpad/crashpad/util/linux/ptracer.cc -@@ -28,6 +28,9 @@ +@@ -28,6 +28,10 @@ #include <asm/ldt.h> - #include <asm/ptrace-abi.h> #endif + +#if defined(ARCH_CPU_ARM_FAMILY) +#include <asm/ptrace.h> +#endif - ++ namespace crashpad { ---- third_party/crashpad/crashpad/util/linux/thread_info.h.orig + namespace { +--- third_party/crashpad/crashpad/util/linux/thread_info.h +++ third_party/crashpad/crashpad/util/linux/thread_info.h -@@ -232,7 +232,7 @@ +@@ -273,7 +273,7 @@ "Size mismatch"); #elif defined(ARCH_CPU_ARMEL) static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch"); |