summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gdb
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-08-05 22:35:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-08 13:41:20 +0100
commit7ae7e7e09a0ecb76413754c70e12fda14d64a0be (patch)
treefd6fc8546949cda5b7cca2ec2e7eaed38a3f9a32 /meta/recipes-devtools/gdb
parent4a5336d403bb0b8dfe2e5f863288a7d3489132c2 (diff)
downloadpoky-7ae7e7e09a0ecb76413754c70e12fda14d64a0be.tar.gz
gdb: Update to 7.3
This has one upstream patch removed and a couple rebased (From OE-Core rev: e1e9ee24e82e0ad45cf18387e131d2365c8e77b4) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gdb')
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc8
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb)2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_7.3.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_7.2.bb)2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch20
-rw-r--r--meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff16
-rw-r--r--meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch36
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.3.bb (renamed from meta/recipes-devtools/gdb/gdb_7.2.bb)4
8 files changed, 37 insertions, 53 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 8ec373546d..df6c70f656 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -2,7 +2,9 @@ DESCRIPTION = "gdb - GNU debugger"
2HOMEPAGE = "http://www.gnu.org/software/gdb/" 2HOMEPAGE = "http://www.gnu.org/software/gdb/"
3LICENSE="GPLv3+" 3LICENSE="GPLv3+"
4SECTION = "devel" 4SECTION = "devel"
5DEPENDS = "ncurses readline elfutils" 5DEPENDS = "ncurses readline elfutils lttng-ust"
6
7INC_PR = "r2"
6 8
7LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
8 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ 10 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
@@ -13,6 +15,9 @@ inherit autotools
13SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ 15SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
14 file://no-werror.patch" 16 file://no-werror.patch"
15 17
18SRC_URI[md5sum] = "1d6b4e469270433583ef62a906c02fa8"
19SRC_URI[sha256sum] = "d1791d1f9d6c21ec265f4f74dadc15bc35698158a1b836d1626b9a69b818f5c5"
20
16export CC_FOR_BUILD = "${BUILD_CC}" 21export CC_FOR_BUILD = "${BUILD_CC}"
17export CXX_FOR_BUILD = "${BUILD_CXX}" 22export CXX_FOR_BUILD = "${BUILD_CXX}"
18export CPP_FOR_BUILD = "${BUILD_CPP}" 23export CPP_FOR_BUILD = "${BUILD_CPP}"
@@ -29,7 +34,6 @@ EXPAT = "--without-expat"
29EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ 34EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
30 --with-curses --disable-multilib --with-system-readline --disable-sim \ 35 --with-curses --disable-multilib --with-system-readline --disable-sim \
31 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \ 36 ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \
32 --without-ust \
33 " 37 "
34 38
35GDBPROPREFIX = "--program-prefix=''" 39GDBPROPREFIX = "--program-prefix=''"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
index ca44b3c4f0..58c20c4372 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.bb
@@ -1,7 +1,7 @@
1require gdb-common.inc 1require gdb-common.inc
2require gdb-cross-canadian.inc 2require gdb-cross-canadian.inc
3 3
4PR = "r1" 4PR = "${INC_PR}.0"
5 5
6GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 6GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
7EXPAT = "--with-expat" 7EXPAT = "--with-expat"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross_7.3.bb
index b5a8beae6d..9c2ed0725f 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.3.bb
@@ -3,4 +3,4 @@ require gdb-cross.inc
3SRC_URI += "file://sim-install-6.6.patch;patch=1" 3SRC_URI += "file://sim-install-6.6.patch;patch=1"
4EXPAT = "--with-expat" 4EXPAT = "--with-expat"
5 5
6PR = "r0" 6PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index efa3cbffe4..9f5f34fed9 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -4,7 +4,7 @@ inherit gettext
4 4
5SRC_URI += "file://kill_arm_map_symbols.patch \ 5SRC_URI += "file://kill_arm_map_symbols.patch \
6 file://gdbserver-cflags-last.diff;striplevel=0 \ 6 file://gdbserver-cflags-last.diff;striplevel=0 \
7 file://fix_for_build_error_internal_error_call.patch " 7 "
8#LDFLAGS_append = " -s" 8#LDFLAGS_append = " -s"
9#export CFLAGS_append=" -L${STAGING_LIBDIR}" 9#export CFLAGS_append=" -L${STAGING_LIBDIR}"
10 10
diff --git a/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch b/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch
deleted file mode 100644
index afb1783c50..0000000000
--- a/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Pending
2
3The prototype of function internall_error has changed. And one place in the code was not synced up with the new prototype, causing build error. This patche fixes that.
4
5Nitin A Kamble <nitin.a.kamble@intel.com>
62010/11/12
7
8Index: gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
9===================================================================
10--- gdb-7.2.orig/gdb/gdbserver/linux-i386-ipa.c
11+++ gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
12@@ -178,7 +178,7 @@ supply_static_tracepoint_registers (stru
13 }
14 break;
15 default:
16- internal_error ("unhandled register size: %d",
17+ internal_error (__FILE__, __LINE__, "unhandled register size: %d",
18 i386_st_collect_regmap[i].size);
19 }
20 }
diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
index 0475a42776..8256f17c30 100644
--- a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
+++ b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
@@ -2,16 +2,18 @@ Upstream-Status: Pending
2 2
3Index: gdb/gdbserver/Makefile.in 3Index: gdb/gdbserver/Makefile.in
4=================================================================== 4===================================================================
5--- gdb/gdbserver/Makefile.in.orig 5--- gdb/gdbserver/Makefile.in.orig 2011-03-09 23:32:02.000000000 -0800
6+++ gdb/gdbserver/Makefile.in 6+++ gdb/gdbserver/Makefile.in 2011-08-05 21:16:43.592202579 -0700
7@@ -89,8 +89,8 @@ WARN_CFLAGS = -Wall 7@@ -94,10 +94,10 @@
8 CFLAGS = @CFLAGS@ 8 CFLAGS = @CFLAGS@
9 9
10 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. 10 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
11-INTERNAL_CFLAGS = $(WARN_CFLAGS) ${CFLAGS} ${GLOBAL_CFLAGS} \ 11-INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \
12- ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} 12+INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
13+INTERNAL_CFLAGS = $(WARN_CFLAGS) ${GLOBAL_CFLAGS} \ 13 ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
14+ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CFLAGS} 14 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
15-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS)
16+INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS}
15 17
16 # LDFLAGS is specifically reserved for setting from the command line 18 # LDFLAGS is specifically reserved for setting from the command line
17 # when running make. 19 # when running make.
diff --git a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
index c1756f7e24..9fc45b9f2a 100644
--- a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
+++ b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch
@@ -1,26 +1,26 @@
1Upstream-Status: Inappropriate [embedded specific] 1Upstream-Status: Inappropriate [embedded specific]
2 2
3Index: gdb-6.3/gdb/arm-tdep.c 3Index: gdb-7.3/gdb/arm-tdep.c
4=================================================================== 4===================================================================
5--- gdb-6.3.orig/gdb/arm-tdep.c 2004-08-03 02:02:20.000000000 +0000 5--- gdb-7.3.orig/gdb/arm-tdep.c 2011-05-17 14:27:01.000000000 -0700
6+++ gdb-6.3/gdb/arm-tdep.c 2005-11-09 15:13:29.000000000 +0000 6+++ gdb-7.3/gdb/arm-tdep.c 2011-08-05 22:29:58.784201850 -0700
7@@ -2491,6 +2491,19 @@ 7@@ -7806,6 +7806,19 @@
8 static void 8 static void
9 arm_elf_make_msymbol_special(asymbol *sym, struct minimal_symbol *msym) 9 arm_elf_make_msymbol_special(asymbol *sym, struct minimal_symbol *msym)
10 { 10 {
11+ 11+
12+ /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when 12+ /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when
13+ displaying disassembly so we use this horrible hack here to 13+ displaying disassembly so we use this horrible hack here to
14+ artifically set their address to the highest possible value. 14+ artifically set their address to the highest possible value.
15+ This is wrong of course, and it prevents the symbols from being 15+ This is wrong of course, and it prevents the symbols from being
16+ used for their intended purpose - to distinguish between ARM 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. */ 17+ and THUMB code. So we ought to find a better way to do this. */
18+ if (bfd_asymbol_name (sym) 18+ if (bfd_asymbol_name (sym)
19+ && bfd_asymbol_name (sym)[0] == '$' 19+ && bfd_asymbol_name (sym)[0] == '$'
20+ && bfd_asymbol_name (sym)[1] != 0 20+ && bfd_asymbol_name (sym)[1] != 0
21+ && bfd_asymbol_name (sym)[2] == 0) 21+ && bfd_asymbol_name (sym)[2] == 0)
22+ SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc; 22+ SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc;
23+ 23+
24 /* Thumb symbols are of type STT_LOPROC, (synonymous with 24 if (ARM_SYM_BRANCH_TYPE (&((elf_symbol_type *)sym)->internal_elf_sym)
25 STT_ARM_TFUNC). */ 25 == ST_BRANCH_TO_THUMB)
26 if (ELF_ST_TYPE (((elf_symbol_type *)sym)->internal_elf_sym.st_info) 26 MSYMBOL_SET_SPECIAL (msym);
diff --git a/meta/recipes-devtools/gdb/gdb_7.2.bb b/meta/recipes-devtools/gdb/gdb_7.3.bb
index 501efb46b2..5e21858c80 100644
--- a/meta/recipes-devtools/gdb/gdb_7.2.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.3.bb
@@ -4,7 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ 4 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
5 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ 5 file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
6 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" 6 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
7PR = "r0" 7PR = "${INC_PR}.0"
8 8
9SRC_URI[md5sum] = "950b766466bee748e554765c86b8b495"
10SRC_URI[sha256sum] = "34919cb51334c8149ae36ed086f35e79fe3fa2b2a85b568d7c0edad20cd972d4"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-24 10:48:45 +0000