summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb)2
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_7.2.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_7.1.bb)2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc3
-rw-r--r--meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch18
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.2.bb (renamed from meta/recipes-devtools/gdb/gdb_7.1.bb)2
5 files changed, 23 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
index 3adcdcc284..5982c0568e 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk"
4 4
5inherit cross-canadian 5inherit cross-canadian
6 6
7PR = "r1" 7PR = "r0"
8 8
9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 9GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
10EXPAT = "--with-expat" 10EXPAT = "--with-expat"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.2.bb
index ea1f0d8c7f..b5a8beae6d 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.2.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 = "r2" 6PR = "r0"
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 0ddd90b191..efa3cbffe4 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -3,7 +3,8 @@ require gdb-common.inc
3inherit gettext 3inherit 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#LDFLAGS_append = " -s" 8#LDFLAGS_append = " -s"
8#export CFLAGS_append=" -L${STAGING_LIBDIR}" 9#export CFLAGS_append=" -L${STAGING_LIBDIR}"
9 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
new file mode 100644
index 0000000000..f39eaa936f
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch
@@ -0,0 +1,18 @@
1The 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.
2
3Nitin A Kamble <nitin.a.kamble@intel.com>
42010/11/12
5
6Index: gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
7===================================================================
8--- gdb-7.2.orig/gdb/gdbserver/linux-i386-ipa.c
9+++ gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
10@@ -178,7 +178,7 @@ supply_static_tracepoint_registers (stru
11 }
12 break;
13 default:
14- internal_error ("unhandled register size: %d",
15+ internal_error (__FILE__, __LINE__, "unhandled register size: %d",
16 i386_st_collect_regmap[i].size);
17 }
18 }
diff --git a/meta/recipes-devtools/gdb/gdb_7.1.bb b/meta/recipes-devtools/gdb/gdb_7.2.bb
index be40f3f12b..ec413a1397 100644
--- a/meta/recipes-devtools/gdb/gdb_7.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.2.bb
@@ -1,3 +1,3 @@
1require gdb.inc 1require gdb.inc
2 2
3PR = "r2" 3PR = "r0"