From e5f5090cc011d25a872973870a738181bbe12724 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 8 Nov 2010 09:12:33 -0800 Subject: gdb upgrade from 7.1 to 7.2 Add new patch: gdb/fix_for_build_error_internal_error_call.patch : this avoids a build error. Signed-off-by: Nitin A Kamble --- meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb | 10 ---------- meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb | 10 ++++++++++ meta/recipes-devtools/gdb/gdb-cross_7.1.bb | 6 ------ meta/recipes-devtools/gdb/gdb-cross_7.2.bb | 6 ++++++ meta/recipes-devtools/gdb/gdb.inc | 3 ++- .../gdb/fix_for_build_error_internal_error_call.patch | 18 ++++++++++++++++++ meta/recipes-devtools/gdb/gdb_7.1.bb | 3 --- meta/recipes-devtools/gdb/gdb_7.2.bb | 3 +++ 8 files changed, 39 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.2.bb create mode 100644 meta/recipes-devtools/gdb/gdb/fix_for_build_error_internal_error_call.patch delete mode 100644 meta/recipes-devtools/gdb/gdb_7.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb_7.2.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb deleted file mode 100644 index 3adcdcc..0000000 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gdb-common.inc - -DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" - -inherit cross-canadian - -PR = "r1" - -GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" -EXPAT = "--with-expat" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb new file mode 100644 index 0000000..5982c05 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb @@ -0,0 +1,10 @@ +require gdb-common.inc + +DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" + +inherit cross-canadian + +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.1.bb deleted file mode 100644 index ea1f0d8..0000000 --- a/meta/recipes-devtools/gdb/gdb-cross_7.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require gdb-cross.inc - -SRC_URI += "file://sim-install-6.6.patch;patch=1" -EXPAT = "--with-expat" - -PR = "r2" diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross_7.2.bb new file mode 100644 index 0000000..b5a8bea --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross_7.2.bb @@ -0,0 +1,6 @@ +require gdb-cross.inc + +SRC_URI += "file://sim-install-6.6.patch;patch=1" +EXPAT = "--with-expat" + +PR = "r0" diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 0ddd90b..efa3cbf 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 0000000..f39eaa9 --- /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 +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.1.bb deleted file mode 100644 index be40f3f..0000000 --- a/meta/recipes-devtools/gdb/gdb_7.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gdb.inc - -PR = "r2" diff --git a/meta/recipes-devtools/gdb/gdb_7.2.bb b/meta/recipes-devtools/gdb/gdb_7.2.bb new file mode 100644 index 0000000..ec413a1 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb_7.2.bb @@ -0,0 +1,3 @@ +require gdb.inc + +PR = "r0" -- cgit v1.1