linux_syscall_support.patch 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334
  1. diff --git a/Makefile.in b/Makefile.in
  2. index 1845638..76f632c 100644
  3. --- a/Makefile.in
  4. +++ b/Makefile.in
  5. @@ -314,8 +314,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
  6. $(am__includecl_HEADERS_DIST) $(am__includeclc_HEADERS_DIST) \
  7. $(am__includecldwc_HEADERS_DIST) \
  8. $(am__includeclh_HEADERS_DIST) $(am__includeclm_HEADERS_DIST) \
  9. - $(includegbc_HEADERS) $(am__includelss_HEADERS_DIST) \
  10. - $(includep_HEADERS) $(am__DIST_COMMON)
  11. + $(includegbc_HEADERS) $(includep_HEADERS) $(am__DIST_COMMON)
  12. am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  13. configure.lineno config.status.lineno
  14. mkinstalldirs = $(install_sh) -d
  15. @@ -340,7 +339,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
  16. "$(DESTDIR)$(includecldir)" "$(DESTDIR)$(includeclcdir)" \
  17. "$(DESTDIR)$(includecldwcdir)" "$(DESTDIR)$(includeclhdir)" \
  18. "$(DESTDIR)$(includeclmdir)" "$(DESTDIR)$(includegbcdir)" \
  19. - "$(DESTDIR)$(includelssdir)" "$(DESTDIR)$(includepdir)"
  20. + "$(DESTDIR)$(includepdir)"
  21. @DISABLE_PROCESSOR_FALSE@am__EXEEXT_5 = src/common/test_assembler_unittest$(EXEEXT) \
  22. @DISABLE_PROCESSOR_FALSE@ src/common/dwarf/dwarf2reader_lineinfo_unittest$(EXEEXT) \
  23. @DISABLE_PROCESSOR_FALSE@ src/common/dwarf/dwarf2reader_splitfunctions_unittest$(EXEEXT) \
  24. @@ -1926,12 +1925,10 @@ am__includeclh_HEADERS_DIST = \
  25. $(top_srcdir)/src/client/linux/handler/*.h
  26. am__includeclm_HEADERS_DIST = \
  27. $(top_srcdir)/src/client/linux/minidump_writer/*.h
  28. -am__includelss_HEADERS_DIST = $(top_srcdir)/src/third_party/lss/*.h
  29. HEADERS = $(includec_HEADERS) $(includecl_HEADERS) \
  30. $(includeclc_HEADERS) $(includecldwc_HEADERS) \
  31. $(includeclh_HEADERS) $(includeclm_HEADERS) \
  32. - $(includegbc_HEADERS) $(includelss_HEADERS) \
  33. - $(includep_HEADERS)
  34. + $(includegbc_HEADERS) $(includep_HEADERS)
  35. am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
  36. # Read a list of newline-separated strings from the standard input,
  37. # and print each of them once, without duplicates. Input order is
  38. @@ -9914,8 +9911,7 @@ install-data-am: install-dist_docDATA install-includecHEADERS \
  39. install-includeclHEADERS install-includeclcHEADERS \
  40. install-includecldwcHEADERS install-includeclhHEADERS \
  41. install-includeclmHEADERS install-includegbcHEADERS \
  42. - install-includelssHEADERS install-includepHEADERS \
  43. - install-pkgconfigDATA
  44. + install-includepHEADERS install-pkgconfigDATA
  45. install-dvi: install-dvi-am
  46. @@ -10274,8 +10270,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
  47. uninstall-includecHEADERS uninstall-includeclHEADERS \
  48. uninstall-includeclcHEADERS uninstall-includecldwcHEADERS \
  49. uninstall-includeclhHEADERS uninstall-includeclmHEADERS \
  50. - uninstall-includegbcHEADERS uninstall-includelssHEADERS \
  51. - uninstall-includepHEADERS uninstall-libLIBRARIES \
  52. + uninstall-includegbcHEADERS uninstall-includepHEADERS uninstall-libLIBRARIES \
  53. uninstall-libexecPROGRAMS uninstall-pkgconfigDATA
  54. .MAKE: check-am install-am install-strip
  55. @@ -10297,7 +10292,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
  56. install-includeclHEADERS install-includeclcHEADERS \
  57. install-includecldwcHEADERS install-includeclhHEADERS \
  58. install-includeclmHEADERS install-includegbcHEADERS \
  59. - install-includelssHEADERS install-includepHEADERS install-info \
  60. + install-includepHEADERS install-info \
  61. install-info-am install-libLIBRARIES install-libexecPROGRAMS \
  62. install-man install-pdf install-pdf-am install-pkgconfigDATA \
  63. install-ps install-ps-am install-strip installcheck \
  64. @@ -10309,7 +10304,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
  65. uninstall-includecHEADERS uninstall-includeclHEADERS \
  66. uninstall-includeclcHEADERS uninstall-includecldwcHEADERS \
  67. uninstall-includeclhHEADERS uninstall-includeclmHEADERS \
  68. - uninstall-includegbcHEADERS uninstall-includelssHEADERS \
  69. + uninstall-includegbcHEADERS \
  70. uninstall-includepHEADERS uninstall-libLIBRARIES \
  71. uninstall-libexecPROGRAMS uninstall-pkgconfigDATA
  72. diff --git a/src/client/linux/crash_generation/crash_generation_client.cc b/src/client/linux/crash_generation/crash_generation_client.cc
  73. index 020c614..85320eb 100644
  74. --- a/src/client/linux/crash_generation/crash_generation_client.cc
  75. +++ b/src/client/linux/crash_generation/crash_generation_client.cc
  76. @@ -40,7 +40,7 @@
  77. #include "common/linux/eintr_wrapper.h"
  78. #include "common/linux/ignore_ret.h"
  79. -#include "third_party/lss/linux_syscall_support.h"
  80. +#include "lss//linux_syscall_support.h"
  81. namespace google_breakpad {
  82. diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
  83. index 9e23c11..6afbf63 100644
  84. --- a/src/client/linux/handler/exception_handler.cc
  85. +++ b/src/client/linux/handler/exception_handler.cc
  86. @@ -98,7 +98,7 @@
  87. #include "client/linux/minidump_writer/linux_dumper.h"
  88. #include "client/linux/minidump_writer/minidump_writer.h"
  89. #include "common/linux/eintr_wrapper.h"
  90. -#include "third_party/lss/linux_syscall_support.h"
  91. +#include "lss//linux_syscall_support.h"
  92. #if defined(__ANDROID__)
  93. #include "linux/sched.h"
  94. diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc
  95. index b2d8d46..5d4204a 100644
  96. --- a/src/client/linux/handler/exception_handler_unittest.cc
  97. +++ b/src/client/linux/handler/exception_handler_unittest.cc
  98. @@ -53,7 +53,7 @@
  99. #include "common/linux/linux_libc_support.h"
  100. #include "common/tests/auto_tempdir.h"
  101. #include "common/using_std_string.h"
  102. -#include "third_party/lss/linux_syscall_support.h"
  103. +#include "lss//linux_syscall_support.h"
  104. #include "google_breakpad/processor/minidump.h"
  105. using namespace google_breakpad;
  106. diff --git a/src/client/linux/log/log.cc b/src/client/linux/log/log.cc
  107. index 2a48d7f..2d49581 100644
  108. --- a/src/client/linux/log/log.cc
  109. +++ b/src/client/linux/log/log.cc
  110. @@ -36,7 +36,7 @@
  111. #include <android/log.h>
  112. #include <dlfcn.h>
  113. #else
  114. -#include "third_party/lss/linux_syscall_support.h"
  115. +#include "lss//linux_syscall_support.h"
  116. #endif
  117. namespace logger {
  118. diff --git a/src/client/linux/minidump_writer/cpu_set.h b/src/client/linux/minidump_writer/cpu_set.h
  119. index 70c1c75..9e198c0 100644
  120. --- a/src/client/linux/minidump_writer/cpu_set.h
  121. +++ b/src/client/linux/minidump_writer/cpu_set.h
  122. @@ -34,7 +34,7 @@
  123. #include <string.h>
  124. #include "common/linux/linux_libc_support.h"
  125. -#include "third_party/lss/linux_syscall_support.h"
  126. +#include "lss//linux_syscall_support.h"
  127. namespace google_breakpad {
  128. diff --git a/src/client/linux/minidump_writer/directory_reader.h b/src/client/linux/minidump_writer/directory_reader.h
  129. index 62bba87..30daa74 100644
  130. --- a/src/client/linux/minidump_writer/directory_reader.h
  131. +++ b/src/client/linux/minidump_writer/directory_reader.h
  132. @@ -37,7 +37,7 @@
  133. #include <string.h>
  134. #include "common/linux/linux_libc_support.h"
  135. -#include "third_party/lss/linux_syscall_support.h"
  136. +#include "lss//linux_syscall_support.h"
  137. namespace google_breakpad {
  138. diff --git a/src/client/linux/minidump_writer/line_reader.h b/src/client/linux/minidump_writer/line_reader.h
  139. index d54a67d..999f3e3 100644
  140. --- a/src/client/linux/minidump_writer/line_reader.h
  141. +++ b/src/client/linux/minidump_writer/line_reader.h
  142. @@ -34,7 +34,7 @@
  143. #include <string.h>
  144. #include "common/linux/linux_libc_support.h"
  145. -#include "third_party/lss/linux_syscall_support.h"
  146. +#include "lss//linux_syscall_support.h"
  147. namespace google_breakpad {
  148. diff --git a/src/client/linux/minidump_writer/linux_dumper.cc b/src/client/linux/minidump_writer/linux_dumper.cc
  149. index 85922a9..d78dce3 100644
  150. --- a/src/client/linux/minidump_writer/linux_dumper.cc
  151. +++ b/src/client/linux/minidump_writer/linux_dumper.cc
  152. @@ -54,7 +54,7 @@
  153. #include "common/linux/memory_mapped_file.h"
  154. #include "common/linux/safe_readlink.h"
  155. #include "google_breakpad/common/minidump_exception_linux.h"
  156. -#include "third_party/lss/linux_syscall_support.h"
  157. +#include "lss//linux_syscall_support.h"
  158. using google_breakpad::elf::FileID;
  159. diff --git a/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
  160. index 5a135fd..e66dc46 100644
  161. --- a/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
  162. +++ b/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
  163. @@ -42,7 +42,7 @@
  164. #include <unistd.h>
  165. #include "common/scoped_ptr.h"
  166. -#include "third_party/lss/linux_syscall_support.h"
  167. +#include "lss//linux_syscall_support.h"
  168. #if defined(__ARM_EABI__)
  169. #define TID_PTR_REGISTER "r3"
  170. diff --git a/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
  171. index 2adc39e..7572315 100644
  172. --- a/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
  173. +++ b/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
  174. @@ -60,7 +60,7 @@
  175. #include "client/linux/minidump_writer/directory_reader.h"
  176. #include "client/linux/minidump_writer/line_reader.h"
  177. #include "common/linux/linux_libc_support.h"
  178. -#include "third_party/lss/linux_syscall_support.h"
  179. +#include "lss//linux_syscall_support.h"
  180. // Suspends a thread by attaching to it.
  181. static bool SuspendThread(pid_t pid) {
  182. diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc
  183. index a95dd25..ce0d07f 100644
  184. --- a/src/client/linux/minidump_writer/minidump_writer.cc
  185. +++ b/src/client/linux/minidump_writer/minidump_writer.cc
  186. @@ -82,7 +82,7 @@
  187. #include "common/linux/linux_libc_support.h"
  188. #include "common/minidump_type_helper.h"
  189. #include "google_breakpad/common/minidump_format.h"
  190. -#include "third_party/lss/linux_syscall_support.h"
  191. +#include "lss//linux_syscall_support.h"
  192. namespace {
  193. diff --git a/src/client/linux/minidump_writer/proc_cpuinfo_reader.h b/src/client/linux/minidump_writer/proc_cpuinfo_reader.h
  194. index 5ae16df..4278341 100644
  195. --- a/src/client/linux/minidump_writer/proc_cpuinfo_reader.h
  196. +++ b/src/client/linux/minidump_writer/proc_cpuinfo_reader.h
  197. @@ -35,7 +35,7 @@
  198. #include "client/linux/minidump_writer/line_reader.h"
  199. #include "common/linux/linux_libc_support.h"
  200. -#include "third_party/lss/linux_syscall_support.h"
  201. +#include "lss//linux_syscall_support.h"
  202. namespace google_breakpad {
  203. diff --git a/src/client/minidump_file_writer.cc b/src/client/minidump_file_writer.cc
  204. index c00af36..c05f2e9 100644
  205. --- a/src/client/minidump_file_writer.cc
  206. +++ b/src/client/minidump_file_writer.cc
  207. @@ -44,7 +44,7 @@
  208. #include "common/linux/linux_libc_support.h"
  209. #include "common/string_conversion.h"
  210. #if defined(__linux__) && __linux__
  211. -#include "third_party/lss/linux_syscall_support.h"
  212. +#include "lss//linux_syscall_support.h"
  213. #endif
  214. #if defined(__ANDROID__)
  215. diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc
  216. index d8fcbd8..ef13264 100644
  217. --- a/src/common/linux/file_id.cc
  218. +++ b/src/common/linux/file_id.cc
  219. @@ -49,7 +49,7 @@
  220. #include "common/linux/linux_libc_support.h"
  221. #include "common/linux/memory_mapped_file.h"
  222. #include "common/using_std_string.h"
  223. -#include "third_party/lss/linux_syscall_support.h"
  224. +#include "lss//linux_syscall_support.h"
  225. namespace google_breakpad {
  226. namespace elf {
  227. diff --git a/src/common/linux/memory_mapped_file.cc b/src/common/linux/memory_mapped_file.cc
  228. index a7b96eb..042915c 100644
  229. --- a/src/common/linux/memory_mapped_file.cc
  230. +++ b/src/common/linux/memory_mapped_file.cc
  231. @@ -43,7 +43,7 @@
  232. #include <unistd.h>
  233. #include "common/memory_range.h"
  234. -#include "third_party/lss/linux_syscall_support.h"
  235. +#include "lss//linux_syscall_support.h"
  236. namespace google_breakpad {
  237. diff --git a/src/common/linux/safe_readlink.cc b/src/common/linux/safe_readlink.cc
  238. index a42b01a..7093951 100644
  239. --- a/src/common/linux/safe_readlink.cc
  240. +++ b/src/common/linux/safe_readlink.cc
  241. @@ -35,7 +35,7 @@
  242. #include <stddef.h>
  243. -#include "third_party/lss/linux_syscall_support.h"
  244. +#include "lss//linux_syscall_support.h"
  245. namespace google_breakpad {
  246. diff --git a/src/common/memory_allocator.h b/src/common/memory_allocator.h
  247. index 1c99913..37a3471 100644
  248. --- a/src/common/memory_allocator.h
  249. +++ b/src/common/memory_allocator.h
  250. @@ -46,7 +46,7 @@
  251. #define sys_munmap munmap
  252. #define MAP_ANONYMOUS MAP_ANON
  253. #else
  254. -#include "third_party/lss/linux_syscall_support.h"
  255. +#include "lss//linux_syscall_support.h"
  256. #endif
  257. namespace google_breakpad {
  258. diff --git a/src/common/module.cc b/src/common/module.cc
  259. index 0eb5aad..b6f5da7 100644
  260. --- a/src/common/module.cc
  261. +++ b/src/common/module.cc
  262. @@ -42,6 +42,7 @@
  263. #include <stdio.h>
  264. #include <string.h>
  265. +#include <algorithm>
  266. #include <functional>
  267. #include <iostream>
  268. #include <memory>
  269. diff --git a/src/processor/testdata/linux_test_app.cc b/src/processor/testdata/linux_test_app.cc
  270. index b0bbb66..38dffb5 100644
  271. --- a/src/processor/testdata/linux_test_app.cc
  272. +++ b/src/processor/testdata/linux_test_app.cc
  273. @@ -49,7 +49,7 @@
  274. #include <string>
  275. #include "client/linux/handler/exception_handler.h"
  276. -#include "third_party/lss/linux_syscall_support.h"
  277. +#include "lss//linux_syscall_support.h"
  278. namespace {
  279. diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc
  280. index 3e310bc..e2f02a4 100644
  281. --- a/src/tools/linux/md2core/minidump-2-core.cc
  282. +++ b/src/tools/linux/md2core/minidump-2-core.cc
  283. @@ -55,7 +55,7 @@
  284. #include "common/using_std_string.h"
  285. #include "google_breakpad/common/breakpad_types.h"
  286. #include "google_breakpad/common/minidump_format.h"
  287. -#include "third_party/lss/linux_syscall_support.h"
  288. +#include "lss//linux_syscall_support.h"
  289. #include "tools/linux/md2core/minidump_memory_range.h"
  290. #if ULONG_MAX == 0xffffffffffffffff