6 files changed, 20 insertions, 20 deletions
diff --git a/meta/recipes-devtools/gdb/gdb_7.5.1.bb b/meta/recipes-devtools/gdb/gdb-7.6.inc
index 0645b5619d..00cb6eea48 100644
--- a/meta/recipes-devtools/gdb/gdb_7.5.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-7.6.inc
@@ -1,9 +1,10 @@
-require gdb.inc
 LICENSE="GPLv2 & GPLv3 & LGPLv2 & LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 		    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
 		    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
-PR = "${INC_PR}.0"
 
 S = "${WORKDIR}/${BPN}-${PV}"
+
+SRC_URI[md5sum] = "a9836707337e5f7bf76a009a8904f470"
+SRC_URI[sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36"
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 6f42dff780..deb3841400 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -23,9 +23,6 @@ inherit autotools
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
           "
-SRC_URI[md5sum] = "b1519bf899890d21d4774845a6e602fe"
-SRC_URI[sha256sum] = "f99f26e2c1127f12ba14ece0947a9a9948be45e96b69ef363131e469a698636e"
-
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CXX_FOR_BUILD = "${BUILD_CXX}"
 export CPP_FOR_BUILD = "${BUILD_CPP}"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.bb
index c15aa7a489..a2194a18ef 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.bb
@@ -1,8 +1,5 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
-
-PR = "${INC_PR}.0"
+require gdb-7.6.inc
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
-
-S = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.5.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.6.bb
index a14d0ba952..62f6937bd5 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.5.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.6.bb
@@ -1,7 +1,4 @@
 require gdb-cross.inc
+require gdb-7.6.inc
 
 SRC_URI += "file://sim-install-6.6.patch"
-
-PR = "${INC_PR}.0"
-
-S = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
index 8256f17c30..4dfc419c43 100644
--- a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
+++ b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
@@ -1,10 +1,14 @@
 Upstream-Status: Pending
 
-Index: gdb/gdbserver/Makefile.in
-===================================================================
---- gdb/gdbserver/Makefile.in.orig	2011-03-09 23:32:02.000000000 -0800
-+++ gdb/gdbserver/Makefile.in	2011-08-05 21:16:43.592202579 -0700
-@@ -94,10 +94,10 @@
+---
+ gdb/gdbserver/Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- gdb/gdbserver/Makefile.in.orig
++++ gdb/gdbserver/Makefile.in
+@@ -118,14 +118,14 @@ WARN_CFLAGS_NO_FORMAT = `echo " $(WARN_C
+ # CFLAGS is specifically reserved for setting from the command line
+ # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
  CFLAGS = @CFLAGS@
  
  # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
@@ -12,8 +16,10 @@ Index: gdb/gdbserver/Makefile.in
 +INTERNAL_CFLAGS_BASE =  ${GLOBAL_CFLAGS} \
  	${PROFILE_CFLAGS} ${INCLUDE_CFLAGS}
  INTERNAL_WARN_CFLAGS =  ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
--INTERNAL_CFLAGS =  ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS)
-+INTERNAL_CFLAGS =  ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS}
+-INTERNAL_CFLAGS =  ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
++INTERNAL_CFLAGS =  ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS} -DGDBSERVER
  
  # LDFLAGS is specifically reserved for setting from the command line
  # when running make.
+ LDFLAGS = @LDFLAGS@
+ INTERNAL_LDFLAGS = $(LDFLAGS) @RDYNAMIC@
diff --git a/meta/recipes-devtools/gdb/gdb_7.6.bb b/meta/recipes-devtools/gdb/gdb_7.6.bb
new file mode 100644
index 0000000000..6b38812d60
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb_7.6.bb
@@ -0,0 +1,2 @@
+require gdb.inc
+require gdb-7.6.inc