Commit c28e15de authored by Chris Zankel's avatar Chris Zankel Committed by Peter Korsgaard
Browse files

xtensa: fix target gdb build and 64-bit host side gdb 



Fix build breakage, use the version of the ptrace header file in asm
instead of sys. Also, fix GDB running on 64 bit hosts. GDB was using
unsigned long for 32-bit registers, but unsigned long is 64 bit on
64-bit hosts.

Signed-off-by: default avatarChris Zankel <chris@zankel.net>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent fdd5bc94

toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
--- gdb-7.4.1/gdb/xtensa-linux-nat.c.orig	2012-10-19 16:23:06.908165323 -0700

+++ gdb-7.4.1/gdb/xtensa-linux-nat.c	2012-10-19 16:35:30.792134876 -0700

@@ -36,7 +36,7 @@

 #include "gdb_wait.h"

 #include <fcntl.h>

 #include <sys/procfs.h>

-#include <sys/ptrace.h>

+#include <asm/ptrace.h>

 

 #include "gregset.h"

 #include "xtensa-tdep.h"

--- gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c.orig	2012-10-19 16:24:06.260162894 -0700

+++ gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c	2012-10-19 16:36:07.920133357 -0700

@@ -23,7 +23,7 @@

 /* Defined in auto-generated file reg-xtensa.c.  */

 void init_registers_xtensa (void);

 

-#include <sys/ptrace.h>

+#include <asm/ptrace.h>

 #include <xtensa-config.h>

 

 #include "xtensa-xtregs.c"

toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
--- gdb-7.4.1/gdb/xtensa-tdep.h.orig	2012-10-30 11:40:23.546448594 -0700

+++ gdb-7.4.1/gdb/xtensa-tdep.h	2012-10-30 11:41:43.078445337 -0700

@@ -17,6 +17,7 @@

    You should have received a copy of the GNU General Public License

    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 

+#include <stdint.h>

 

 /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION

    whenever the "tdep" structure changes in an incompatible way.  */

@@ -84,7 +85,7 @@

 /* Xtensa ELF core file register set representation ('.reg' section).

    Copied from target-side ELF header <xtensa/elf.h>.  */

 

-typedef unsigned long xtensa_elf_greg_t;

+typedef uint32_t xtensa_elf_greg_t;

 

 typedef struct

 {