diff options
Diffstat (limited to 'toolchain/gdb')
| -rw-r--r-- | toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch | 22 | ||||
| -rw-r--r-- | toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch | 19 | ||||
| -rw-r--r-- | toolchain/gdb/gdb.mk | 7 |
3 files changed, 45 insertions, 3 deletions
diff --git a/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch b/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch new file mode 100644 index 000000000..3d1b07c99 --- /dev/null +++ b/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch @@ -0,0 +1,22 @@ +--- 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" diff --git a/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch b/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch new file mode 100644 index 000000000..e10bb8f3e --- /dev/null +++ b/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch @@ -0,0 +1,19 @@ +--- 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 + { diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index dc305a63b..4b8fe3a3d 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -25,9 +25,9 @@ gdb-unpacked: $(GDB_DIR)/.unpacked $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) mkdir -p $(GDB_DIR) $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) - -ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) - tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip, \ - $(BR2_xtensa_core_name)).tar -C $(@D) bfd include gdb +ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) + tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip, \ + $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gdb endif ifneq ($(wildcard $(GDB_PATCH_DIR)),) support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch @@ -196,6 +196,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured # force ELF support since it fails due to BFD linking problems + $(HOST_MAKE_ENV) \ gdb_cv_var_elf=yes \ $(MAKE) -C $(GDB_HOST_DIR) strip $(GDB_HOST_DIR)/gdb/gdb |