Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crash: fix build failure with mips #11

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ gdb_patch:
grep 'extern ps_err_e ps_get_thread_area (struct' /usr/include/proc_service.h; \
if [ $$? -eq 0 ]; then \
patch -p0 < ${GDB}-proc_service.h.patch; \
patch -p1 < crash-fix-build-failure-with-mips.patch; \
fi; \
fi

Expand Down
39 changes: 39 additions & 0 deletions crash-fix-build-failure-with-mips.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 615c802d9c73fad48723b6567042cd54f6795849 Mon Sep 17 00:00:00 2001
From: Dengke Du <[email protected]>
Date: Thu, 4 May 2017 06:14:47 +0000
Subject: [PATCH] crash: fix build failure with mips

When build crash with mips:

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mips-linux-nat.c:157:1: error: conflicting types for 'ps_get_thread_area'
ps_get_thread_area (const struct ps_prochandle *ph,
^~~~~~~~~~~~~~~~~~
In file included from gdb_proc_service.h:26:0,
from mips-linux-nat.c:32:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This problem have been fixed on intel and arm plantform, we can use the
similar approch to fix it on mips.

Signed-off-by: Dengke Du <[email protected]>
---
gdb-7.6/gdb/mips-linux-nat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb-7.6/gdb/mips-linux-nat.c b/gdb-7.6/gdb/mips-linux-nat.c
index 61e83c6..d517e37 100644
--- a/gdb-7.6/gdb/mips-linux-nat.c
+++ b/gdb-7.6/gdb/mips-linux-nat.c
@@ -154,7 +154,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store)
/* Fetch the thread-local storage pointer for libthread_db. */

ps_err_e
-ps_get_thread_area (const struct ps_prochandle *ph,
+ps_get_thread_area (struct ps_prochandle *ph,
lwpid_t lwpid, int idx, void **base)
{
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
--
2.11.0