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