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"
 
 inherit cross-canadian
 
-PR = "r1"
+PR = "r0"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 EXPAT = "--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
 SRC_URI += "file://sim-install-6.6.patch;patch=1"
 EXPAT = "--with-expat"
 
-PR = "r2"
+PR = "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
 inherit gettext
 
 SRC_URI += "file://kill_arm_map_symbols.patch \
-            file://gdbserver-cflags-last.diff;striplevel=0 "
+            file://gdbserver-cflags-last.diff;striplevel=0 \
+            file://fix_for_build_error_internal_error_call.patch "
 #LDFLAGS_append = " -s"
 #export CFLAGS_append=" -L${STAGING_LIBDIR}"
 
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 @@
+The 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.
+
+Nitin A Kamble <nitin.a.kamble@intel.com>
+2010/11/12
+
+Index: gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
+===================================================================
+--- gdb-7.2.orig/gdb/gdbserver/linux-i386-ipa.c
++++ gdb-7.2/gdb/gdbserver/linux-i386-ipa.c
+@@ -178,7 +178,7 @@ supply_static_tracepoint_registers (stru
+ 	    }
+ 	    break;
+ 	  default:
+-	    internal_error ("unhandled register size: %d",
++	    internal_error (__FILE__, __LINE__, "unhandled register size: %d",
+ 			    i386_st_collect_regmap[i].size);
+ 	  }
+       }
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 @@
 require gdb.inc
 
-PR = "r2"
+PR = "r0"