1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
diff --git a/src/coredumper_unittest.c b/src/coredumper_unittest.c
index b53443e..a6d89f7 100644
--- a/src/coredumper_unittest.c
+++ b/src/coredumper_unittest.c
@@ -139,7 +139,7 @@ static void CheckWithReadElf(FILE *input, FILE *output, const char *filename,
"Core file", "no sections in this file",
"NOTE",
"no relocations in this file",
- "no unwind sections in this file",
+ "The decoding of unwind sections for machine type Advanced Micro Devices X86-64 is not currently supported.",
"No version information found in this file",
"NT_PRPSINFO",
#ifndef __mips__
@@ -424,18 +424,16 @@ static void CheckWithGDB(FILE *input, FILE *output, const char *filename,
* to gdb. "*" is a glob wildcard character.
*/
static const char *msg[] = { "Core was generated by",
- " @ process * *"DUMPFUNCTION,
- "[Switching to thread * *"DUMPFUNCTION,
+ " @ Thread * *"DUMPFUNCTION,
+ "[Current thread is *",
"#* *CoreDump",
"#@ * TestCoreDump",
" TestCoreDump",
"$1 = ",
#ifdef THREADS
" Busy",
- " @ process * Busy",
- "[Switching to thread * Busy",
- "Busy",
- "Busy",
+ " @ Thread * Busy",
+ "#* *CoreDump",
#endif
"DONE", 0 };
diff --git a/src/elfcore.c b/src/elfcore.c
index 4304770..0301f0a 100644
--- a/src/elfcore.c
+++ b/src/elfcore.c
@@ -40,6 +40,7 @@ extern "C" {
#include <elf.h>
#include <fcntl.h>
#include <limits.h>
+#include <linux/sched.h>
#include <pthread.h>
#include <signal.h>
#include <stdint.h>
diff --git a/src/linux_syscall_support_unittest.cc b/src/linux_syscall_support_unittest.cc
index 3c7dd29..616f382 100644
--- a/src/linux_syscall_support_unittest.cc
+++ b/src/linux_syscall_support_unittest.cc
@@ -62,7 +62,6 @@ namespace linux_syscall_support {
#include <asm/posix_types.h>
#include <asm/types.h>
#include <errno.h>
-#include <linux/dirent.h>
#include <linux/types.h>
#include <linux/unistd.h>
#include <signal.h>
@@ -91,8 +90,6 @@ static void CheckStructures() {
// there are a small number of data structures (e.g "struct
// kernel_old_sigaction") that we cannot test at all, as glibc does
// not have any definitions for them.
- CHECK(sizeof(struct dirent64) == sizeof(struct kernel_dirent64));
- CHECK(sizeof(struct dirent) == sizeof(struct kernel_dirent));
CHECK(sizeof(struct iovec) == sizeof(struct kernel_iovec));
CHECK(sizeof(struct msghdr) == sizeof(struct kernel_msghdr));
CHECK(sizeof(struct pollfd) == sizeof(struct kernel_pollfd));
diff --git a/src/linuxthreads.c b/src/linuxthreads.c
index c09c68e..f7ba427 100644
--- a/src/linuxthreads.c
+++ b/src/linuxthreads.c
@@ -39,7 +39,7 @@ extern "C" {
#endif
#include <asm/stat.h>
-#include <sched.h>
+#include <linux/sched.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
@@ -49,7 +49,6 @@ extern "C" {
#include <asm/fcntl.h>
#include <asm/posix_types.h>
#include <asm/types.h>
-#include <linux/dirent.h>
#include "linux_syscall_support.h"
#include "thread_lister.h"
|