1*4882a593SmuzhiyunFrom c151ad89ab323db1730c8b3d77bd72d415c80ca1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 25 Sep 2018 12:59:05 -0700 4*4882a593SmuzhiyunSubject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get 5*4882a593Smuzhiyun __WORDSIZE on musl libc 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 8*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 9*4882a593SmuzhiyunUpstream-Status: Pending 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun chromium/third_party/breakpad/breakpad/configure.ac | 2 +- 12*4882a593Smuzhiyun .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 2 ++ 13*4882a593Smuzhiyun .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 + 14*4882a593Smuzhiyun 3 files changed, 4 insertions(+), 1 deletion(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac 17*4882a593Smuzhiyunindex 08513687f34..13745540a5e 100644 18*4882a593Smuzhiyun--- a/chromium/third_party/breakpad/breakpad/configure.ac 19*4882a593Smuzhiyun+++ b/chromium/third_party/breakpad/breakpad/configure.ac 20*4882a593Smuzhiyun@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32, 21*4882a593Smuzhiyun AC_HEADER_STDC 22*4882a593Smuzhiyun AC_SYS_LARGEFILE 23*4882a593Smuzhiyun AX_PTHREAD 24*4882a593Smuzhiyun-AC_CHECK_HEADERS([a.out.h sys/random.h]) 25*4882a593Smuzhiyun+AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h]) 26*4882a593Smuzhiyun AC_CHECK_FUNCS([arc4random getcontext getrandom]) 27*4882a593Smuzhiyun AM_CONDITIONAL([HAVE_GETCONTEXT], [test "x$ac_cv_func_getcontext" = xyes]) 28*4882a593Smuzhiyun 29*4882a593Smuzhiyundiff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc 30*4882a593Smuzhiyunindex bbfdba68093..d7d5dcf0e92 100644 31*4882a593Smuzhiyun--- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc 32*4882a593Smuzhiyun+++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc 33*4882a593Smuzhiyun@@ -30,6 +30,8 @@ 34*4882a593Smuzhiyun #define _GNU_SOURCE // needed for pread() 35*4882a593Smuzhiyun #endif 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun+#include <config.h> 38*4882a593Smuzhiyun+#include <sys/reg.h> 39*4882a593Smuzhiyun #include <fcntl.h> 40*4882a593Smuzhiyun #include <limits.h> 41*4882a593Smuzhiyun #include <string.h> 42*4882a593Smuzhiyundiff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h 43*4882a593Smuzhiyunindex 6e153745dba..5cd2c6fcb23 100644 44*4882a593Smuzhiyun--- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h 45*4882a593Smuzhiyun+++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h 46*4882a593Smuzhiyun@@ -33,6 +33,7 @@ 47*4882a593Smuzhiyun #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_ 48*4882a593Smuzhiyun #define COMMON_LINUX_ELF_CORE_DUMP_H_ 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun+#include <sys/reg.h> 51*4882a593Smuzhiyun #include <elf.h> 52*4882a593Smuzhiyun #include <limits.h> 53*4882a593Smuzhiyun #include <link.h> 54