diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-7.8.1.inc (renamed from meta/recipes-devtools/gdb/gdb-7.7.1.inc) | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb_7.8.1.bb (renamed from meta/recipes-devtools/gdb/gdb_7.7.1.bb) | 0 |
7 files changed, 4 insertions, 61 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-7.7.1.inc b/meta/recipes-devtools/gdb/gdb-7.8.1.inc index aa16d5a09f..6fa13bc582 100644 --- a/meta/recipes-devtools/gdb/gdb-7.7.1.inc +++ b/meta/recipes-devtools/gdb/gdb-7.8.1.inc | |||
@@ -6,5 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
6 | 6 | ||
7 | S = "${WORKDIR}/${BPN}-${PV}" | 7 | S = "${WORKDIR}/${BPN}-${PV}" |
8 | 8 | ||
9 | SRC_URI[md5sum] = "45b07b53d81832d32ccd4829465d4886" | 9 | SRC_URI[md5sum] = "997492cc3475c96f35ecc8775248c9b1" |
10 | SRC_URI[sha256sum] = "eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff" | 10 | SRC_URI[sha256sum] = "d7a923d876ecfa1cec4c1c79c014c9d8e58783a25855a95cf260275f61990647" |
11 | |||
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb index 301035940c..301035940c 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb index f9da486d7d..f9da486d7d 100644 --- a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 7b3e59af62..2c95e03b1b 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc | |||
@@ -2,10 +2,8 @@ require gdb-common.inc | |||
2 | 2 | ||
3 | inherit gettext | 3 | inherit gettext |
4 | 4 | ||
5 | SRC_URI += "file://kill_arm_map_symbols.patch \ | 5 | SRC_URI += "file://gdbserver-cflags-last.diff;striplevel=0 \ |
6 | file://gdbserver-cflags-last.diff;striplevel=0 \ | ||
7 | file://renesas-sh-native-support.patch \ | 6 | file://renesas-sh-native-support.patch \ |
8 | file://include_asm_ptrace.patch \ | ||
9 | " | 7 | " |
10 | #LDFLAGS_append = " -s" | 8 | #LDFLAGS_append = " -s" |
11 | #export CFLAGS_append=" -L${STAGING_LIBDIR}" | 9 | #export CFLAGS_append=" -L${STAGING_LIBDIR}" |
diff --git a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch deleted file mode 100644 index 85e0147665..0000000000 --- a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | gdb: include asm/ptrace.h in two aarch64 source files | ||
2 | |||
3 | Both sys/ptrace.h and asm/ptrace.h need to be included. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: joe.slater@windriver.com | ||
8 | |||
9 | |||
10 | --- a/gdb/aarch64-linux-nat.c | ||
11 | +++ b/gdb/aarch64-linux-nat.c | ||
12 | @@ -32,6 +32,8 @@ | ||
13 | #include "elf/common.h" | ||
14 | |||
15 | #include <sys/ptrace.h> | ||
16 | +#include <asm/ptrace.h> | ||
17 | + | ||
18 | #include <sys/utsname.h> | ||
19 | |||
20 | #include "gregset.h" | ||
21 | --- a/gdb/gdbserver/linux-aarch64-low.c | ||
22 | +++ b/gdb/gdbserver/linux-aarch64-low.c | ||
23 | @@ -26,6 +26,7 @@ | ||
24 | #include <signal.h> | ||
25 | #include <sys/user.h> | ||
26 | #include <sys/ptrace.h> | ||
27 | +#include <asm/ptrace.h> | ||
28 | #include <sys/uio.h> | ||
29 | |||
30 | #include "gdb_proc_service.h" | ||
diff --git a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch deleted file mode 100644 index 9fc45b9f2a..0000000000 --- a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: gdb-7.3/gdb/arm-tdep.c | ||
4 | =================================================================== | ||
5 | --- gdb-7.3.orig/gdb/arm-tdep.c 2011-05-17 14:27:01.000000000 -0700 | ||
6 | +++ gdb-7.3/gdb/arm-tdep.c 2011-08-05 22:29:58.784201850 -0700 | ||
7 | @@ -7806,6 +7806,19 @@ | ||
8 | static void | ||
9 | arm_elf_make_msymbol_special(asymbol *sym, struct minimal_symbol *msym) | ||
10 | { | ||
11 | + | ||
12 | + /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when | ||
13 | + displaying disassembly so we use this horrible hack here to | ||
14 | + artifically set their address to the highest possible value. | ||
15 | + This is wrong of course, and it prevents the symbols from being | ||
16 | + used for their intended purpose - to distinguish between ARM | ||
17 | + and THUMB code. So we ought to find a better way to do this. */ | ||
18 | + if (bfd_asymbol_name (sym) | ||
19 | + && bfd_asymbol_name (sym)[0] == '$' | ||
20 | + && bfd_asymbol_name (sym)[1] != 0 | ||
21 | + && bfd_asymbol_name (sym)[2] == 0) | ||
22 | + SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc; | ||
23 | + | ||
24 | if (ARM_SYM_BRANCH_TYPE (&((elf_symbol_type *)sym)->internal_elf_sym) | ||
25 | == ST_BRANCH_TO_THUMB) | ||
26 | MSYMBOL_SET_SPECIAL (msym); | ||
diff --git a/meta/recipes-devtools/gdb/gdb_7.7.1.bb b/meta/recipes-devtools/gdb/gdb_7.8.1.bb index 1abc9d8e76..1abc9d8e76 100644 --- a/meta/recipes-devtools/gdb/gdb_7.7.1.bb +++ b/meta/recipes-devtools/gdb/gdb_7.8.1.bb | |||