Patchwork gdb: upgraded to 7.6

login
register
mail settings
Submitter Bogdan Marinescu
Date May 8, 2013, 11:59 a.m.
Message ID <1368014380-23653-1-git-send-email-bogdan.a.marinescu@intel.com>
Download mbox | patch
Permalink /patch/49569/
State New
Headers show

Comments

Bogdan Marinescu - May 8, 2013, 11:59 a.m.
'gdbserver-cflags-last.diff' was integrated into upstream.

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 meta/recipes-devtools/gdb/gdb-common.inc            |    6 ++----
 ...-canadian_7.5.1.bb => gdb-cross-canadian_7.6.bb} |    2 --
 .../gdb/{gdb-cross_7.5.1.bb => gdb-cross_7.6.bb}    |    2 --
 meta/recipes-devtools/gdb/gdb.inc                   |    1 -
 .../gdb/gdb/gdbserver-cflags-last.diff              |   19 -------------------
 .../gdb/{gdb_7.5.1.bb => gdb_7.6.bb}                |    1 -
 6 files changed, 2 insertions(+), 29 deletions(-)
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.5.1.bb => gdb-cross-canadian_7.6.bb} (87%)
 rename meta/recipes-devtools/gdb/{gdb-cross_7.5.1.bb => gdb-cross_7.6.bb} (82%)
 delete mode 100644 meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
 rename meta/recipes-devtools/gdb/{gdb_7.5.1.bb => gdb_7.6.bb} (94%)
Saul Wold - May 8, 2013, 2:29 p.m.
On 05/08/2013 04:59 AM, Bogdan Marinescu wrote:
> 'gdbserver-cflags-last.diff' was integrated into upstream.
>
Was it really?  I note that the patch from Marcin still incorporates a 
similar patch, please verify this should not be a rebase.


Sau!

> Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> ---
>   meta/recipes-devtools/gdb/gdb-common.inc            |    6 ++----
>   ...-canadian_7.5.1.bb => gdb-cross-canadian_7.6.bb} |    2 --
>   .../gdb/{gdb-cross_7.5.1.bb => gdb-cross_7.6.bb}    |    2 --
>   meta/recipes-devtools/gdb/gdb.inc                   |    1 -
>   .../gdb/gdb/gdbserver-cflags-last.diff              |   19 -------------------
>   .../gdb/{gdb_7.5.1.bb => gdb_7.6.bb}                |    1 -
>   6 files changed, 2 insertions(+), 29 deletions(-)
>   rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.5.1.bb => gdb-cross-canadian_7.6.bb} (87%)
>   rename meta/recipes-devtools/gdb/{gdb-cross_7.5.1.bb => gdb-cross_7.6.bb} (82%)
>   delete mode 100644 meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
>   rename meta/recipes-devtools/gdb/{gdb_7.5.1.bb => gdb_7.6.bb} (94%)
>
> diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
> index f574d5c..eca66b4 100644
> --- a/meta/recipes-devtools/gdb/gdb-common.inc
> +++ b/meta/recipes-devtools/gdb/gdb-common.inc
> @@ -12,8 +12,6 @@ LTTNGUST_mips64 = ""
>   LTTNGUST_mips64el = ""
>   LTTNGUST_sh4 = ""
>
> -INC_PR = "r0"
> -
>   LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
>   		file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
>   		file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
> @@ -22,8 +20,8 @@ inherit autotools
>
>   SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
>             "
> -SRC_URI[md5sum] = "b1519bf899890d21d4774845a6e602fe"
> -SRC_URI[sha256sum] = "f99f26e2c1127f12ba14ece0947a9a9948be45e96b69ef363131e469a698636e"
> +SRC_URI[md5sum] = "a9836707337e5f7bf76a009a8904f470"
> +SRC_URI[sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36"
>
>   export CC_FOR_BUILD = "${BUILD_CC}"
>   export CXX_FOR_BUILD = "${BUILD_CXX}"
> 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
> similarity index 87%
> rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.bb
> index c15aa7a..cbb7402 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,6 @@
>   require gdb-common.inc
>   require gdb-cross-canadian.inc
>
> -PR = "${INC_PR}.0"
> -
>   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
> similarity index 82%
> rename from meta/recipes-devtools/gdb/gdb-cross_7.5.1.bb
> rename to meta/recipes-devtools/gdb/gdb-cross_7.6.bb
> index a14d0ba..8836119 100644
> --- a/meta/recipes-devtools/gdb/gdb-cross_7.5.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb-cross_7.6.bb
> @@ -2,6 +2,4 @@ require gdb-cross.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.inc b/meta/recipes-devtools/gdb/gdb.inc
> index a620eca..eb65939 100644
> --- a/meta/recipes-devtools/gdb/gdb.inc
> +++ b/meta/recipes-devtools/gdb/gdb.inc
> @@ -3,7 +3,6 @@ require gdb-common.inc
>   inherit gettext
>
>   SRC_URI += "file://kill_arm_map_symbols.patch \
> -            file://gdbserver-cflags-last.diff;striplevel=0 \
>   	    file://renesas-sh-native-support.patch \
>              "
>   #LDFLAGS_append = " -s"
> diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
> deleted file mode 100644
> index 8256f17..0000000
> --- a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -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 @@
> - CFLAGS = @CFLAGS@
> -
> - # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
> --INTERNAL_CFLAGS_BASE =  ${CFLAGS} ${GLOBAL_CFLAGS} \
> -+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}
> -
> - # LDFLAGS is specifically reserved for setting from the command line
> - # when running make.
> diff --git a/meta/recipes-devtools/gdb/gdb_7.5.1.bb b/meta/recipes-devtools/gdb/gdb_7.6.bb
> similarity index 94%
> rename from meta/recipes-devtools/gdb/gdb_7.5.1.bb
> rename to meta/recipes-devtools/gdb/gdb_7.6.bb
> index 0645b56..cd323f5 100644
> --- a/meta/recipes-devtools/gdb/gdb_7.5.1.bb
> +++ b/meta/recipes-devtools/gdb/gdb_7.6.bb
> @@ -4,6 +4,5 @@ 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}"
>
Bogdan Marinescu - May 9, 2013, 7:48 a.m.
On Wed, May 8, 2013 at 5:29 PM, Saul Wold <sgw@linux.intel.com> wrote:

> On 05/08/2013 04:59 AM, Bogdan Marinescu wrote:
>
>> 'gdbserver-cflags-last.diff' was integrated into upstream.
>>
>>  Was it really?  I note that the patch from Marcin still incorporates a
> similar patch, please verify this should not be a rebase.
>

I will recheck. However, does it make sense for us to work in parallel on
upgrading the same package?

Thanks,
Bogdan


>
>
> Sau!
>
>
>  Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> ---
>>   meta/recipes-devtools/gdb/gdb-**common.inc            |    6 ++----
>>   ...-canadian_7.5.1.bb => gdb-cross-canadian_7.6.bb} |    2 --
>>   .../gdb/{gdb-cross_7.5.1.bb => gdb-cross_7.6.bb}    |    2 --
>>   meta/recipes-devtools/gdb/gdb.**inc                   |    1 -
>>   .../gdb/gdb/gdbserver-cflags-**last.diff              |   19
>> -------------------
>>   .../gdb/{gdb_7.5.1.bb => gdb_7.6.bb}                |    1 -
>>   6 files changed, 2 insertions(+), 29 deletions(-)
>>   rename meta/recipes-devtools/gdb/{gdb**-cross-canadian_7.5.1.bb<http://gdb-cross-canadian_7.5.1.bb>=>
>> gdb-cross-canadian_7.6.bb} (87%)
>>   rename meta/recipes-devtools/gdb/{gdb**-cross_7.5.1.bb<http://gdb-cross_7.5.1.bb>=>
>> gdb-cross_7.6.bb} (82%)
>>   delete mode 100644 meta/recipes-devtools/gdb/gdb/**
>> gdbserver-cflags-last.diff
>>   rename meta/recipes-devtools/gdb/{gdb**_7.5.1.bb <http://gdb_7.5.1.bb>=>
>> gdb_7.6.bb} (94%)
>>
>> diff --git a/meta/recipes-devtools/gdb/**gdb-common.inc
>> b/meta/recipes-devtools/gdb/**gdb-common.inc
>> index f574d5c..eca66b4 100644
>> --- a/meta/recipes-devtools/gdb/**gdb-common.inc
>> +++ b/meta/recipes-devtools/gdb/**gdb-common.inc
>> @@ -12,8 +12,6 @@ LTTNGUST_mips64 = ""
>>   LTTNGUST_mips64el = ""
>>   LTTNGUST_sh4 = ""
>>
>> -INC_PR = "r0"
>> -
>>   LIC_FILES_CHKSUM = "file://COPYING;md5=**59530bdf33659b29e73d4adb9f9f65
>> **52 \
>>                 file://COPYING.LIB;md5=**9f604d8a4f8e74f4f5140845a21b66**74
>> \
>>                 file://COPYING3;md5=**d32239bcb673463ab874e80d47fae5**04
>> \
>> @@ -22,8 +20,8 @@ inherit autotools
>>
>>   SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.**tar.gz \
>>             "
>> -SRC_URI[md5sum] = "**b1519bf899890d21d4774845a6e602**fe"
>> -SRC_URI[sha256sum] = "**f99f26e2c1127f12ba14ece0947a9a**
>> 9948be45e96b69ef363131e469a698**636e"
>> +SRC_URI[md5sum] = "**a9836707337e5f7bf76a009a8904f4**70"
>> +SRC_URI[sha256sum] = "**8070389a5dcc104eb0be483d582729**
>> f98ed4d761ad19cedd3f17b5d2502f**aa36"
>>
>>   export CC_FOR_BUILD = "${BUILD_CC}"
>>   export CXX_FOR_BUILD = "${BUILD_CXX}"
>> diff --git a/meta/recipes-devtools/gdb/gd**b-cross-canadian_7.5.1.bb<http://gdb-cross-canadian_7.5.1.bb>b/meta/recipes-devtools/gdb/
>> gd**b-cross-canadian_7.6.bb <http://gdb-cross-canadian_7.6.bb>
>> similarity index 87%
>> rename from meta/recipes-devtools/gdb/gdb-**cross-canadian_7.5.1.bb<http://gdb-cross-canadian_7.5.1.bb>
>> rename to meta/recipes-devtools/gdb/gdb-**cross-canadian_7.6.bb<http://gdb-cross-canadian_7.6.bb>
>> index c15aa7a..cbb7402 100644
>> --- a/meta/recipes-devtools/gdb/gd**b-cross-canadian_7.5.1.bb<http://gdb-cross-canadian_7.5.1.bb>
>> +++ b/meta/recipes-devtools/gdb/gd**b-cross-canadian_7.6.bb<http://gdb-cross-canadian_7.6.bb>
>> @@ -1,8 +1,6 @@
>>   require gdb-common.inc
>>   require gdb-cross-canadian.inc
>>
>> -PR = "${INC_PR}.0"
>> -
>>   GDBPROPREFIX = "--program-prefix='${TARGET_**PREFIX}'"
>>
>>   S = "${WORKDIR}/${BPN}-${PV}"
>> diff --git a/meta/recipes-devtools/gdb/gd**b-cross_7.5.1.bb<http://gdb-cross_7.5.1.bb>b/meta/recipes-devtools/gdb/
>> gd**b-cross_7.6.bb <http://gdb-cross_7.6.bb>
>> similarity index 82%
>> rename from meta/recipes-devtools/gdb/gdb-**cross_7.5.1.bb<http://gdb-cross_7.5.1.bb>
>> rename to meta/recipes-devtools/gdb/gdb-**cross_7.6.bb<http://gdb-cross_7.6.bb>
>> index a14d0ba..8836119 100644
>> --- a/meta/recipes-devtools/gdb/gd**b-cross_7.5.1.bb<http://gdb-cross_7.5.1.bb>
>> +++ b/meta/recipes-devtools/gdb/gd**b-cross_7.6.bb<http://gdb-cross_7.6.bb>
>> @@ -2,6 +2,4 @@ require gdb-cross.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.inc
>> b/meta/recipes-devtools/gdb/**gdb.inc
>> index a620eca..eb65939 100644
>> --- a/meta/recipes-devtools/gdb/**gdb.inc
>> +++ b/meta/recipes-devtools/gdb/**gdb.inc
>> @@ -3,7 +3,6 @@ require gdb-common.inc
>>   inherit gettext
>>
>>   SRC_URI += "file://kill_arm_map_symbols.**patch \
>> -            file://gdbserver-cflags-last.**diff;striplevel=0 \
>>             file://renesas-sh-native-**support.patch \
>>              "
>>   #LDFLAGS_append = " -s"
>> diff --git a/meta/recipes-devtools/gdb/**gdb/gdbserver-cflags-last.diff
>> b/meta/recipes-devtools/gdb/**gdb/gdbserver-cflags-last.diff
>> deleted file mode 100644
>> index 8256f17..0000000
>> --- a/meta/recipes-devtools/gdb/**gdb/gdbserver-cflags-last.diff
>> +++ /dev/null
>> @@ -1,19 +0,0 @@
>> -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 @@
>> - CFLAGS = @CFLAGS@
>> -
>> - # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
>> --INTERNAL_CFLAGS_BASE =  ${CFLAGS} ${GLOBAL_CFLAGS} \
>> -+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}
>> -
>> - # LDFLAGS is specifically reserved for setting from the command line
>> - # when running make.
>> diff --git a/meta/recipes-devtools/gdb/gd**b_7.5.1.bb<http://gdb_7.5.1.bb>b/meta/recipes-devtools/gdb/
>> gd**b_7.6.bb <http://gdb_7.6.bb>
>> similarity index 94%
>> rename from meta/recipes-devtools/gdb/gdb_**7.5.1.bb<http://gdb_7.5.1.bb>
>> rename to meta/recipes-devtools/gdb/gdb_**7.6.bb <http://gdb_7.6.bb>
>> index 0645b56..cd323f5 100644
>> --- a/meta/recipes-devtools/gdb/gd**b_7.5.1.bb <http://gdb_7.5.1.bb>
>> +++ b/meta/recipes-devtools/gdb/gd**b_7.6.bb <http://gdb_7.6.bb>
>> @@ -4,6 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=**
>> 59530bdf33659b29e73d4adb9f9f65**52 \
>>                     file://COPYING3;md5=**d32239bcb673463ab874e80d47fae5*
>> *04 \
>>                     file://COPYING3.LIB;md5=**
>> 6a6a8e020838b23406c81b19c1d46d**f6 \
>>                     file://COPYING.LIB;md5=**
>> 9f604d8a4f8e74f4f5140845a21b66**74"
>> -PR = "${INC_PR}.0"
>>
>>   S = "${WORKDIR}/${BPN}-${PV}"
>>
>>
Marcin Juszkiewicz - May 9, 2013, 8:36 a.m.
W dniu 09.05.2013 09:48, Marinescu, Bogdan A pisze:
> I will recheck. However, does it make sense for us to work in parallel
> on upgrading the same package?

I will update my patches later today.

Patch

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index f574d5c..eca66b4 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -12,8 +12,6 @@  LTTNGUST_mips64 = ""
 LTTNGUST_mips64el = ""
 LTTNGUST_sh4 = ""
 
-INC_PR = "r0"
-
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 		file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
 		file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
@@ -22,8 +20,8 @@  inherit autotools
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
           "
-SRC_URI[md5sum] = "b1519bf899890d21d4774845a6e602fe"
-SRC_URI[sha256sum] = "f99f26e2c1127f12ba14ece0947a9a9948be45e96b69ef363131e469a698636e"
+SRC_URI[md5sum] = "a9836707337e5f7bf76a009a8904f470"
+SRC_URI[sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CXX_FOR_BUILD = "${BUILD_CXX}"
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
similarity index 87%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.6.bb
index c15aa7a..cbb7402 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,6 @@ 
 require gdb-common.inc
 require gdb-cross-canadian.inc
 
-PR = "${INC_PR}.0"
-
 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
similarity index 82%
rename from meta/recipes-devtools/gdb/gdb-cross_7.5.1.bb
rename to meta/recipes-devtools/gdb/gdb-cross_7.6.bb
index a14d0ba..8836119 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.5.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.6.bb
@@ -2,6 +2,4 @@  require gdb-cross.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.inc b/meta/recipes-devtools/gdb/gdb.inc
index a620eca..eb65939 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -3,7 +3,6 @@  require gdb-common.inc
 inherit gettext
 
 SRC_URI += "file://kill_arm_map_symbols.patch \
-            file://gdbserver-cflags-last.diff;striplevel=0 \
 	    file://renesas-sh-native-support.patch \
            "
 #LDFLAGS_append = " -s"
diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff b/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
deleted file mode 100644
index 8256f17..0000000
--- a/meta/recipes-devtools/gdb/gdb/gdbserver-cflags-last.diff
+++ /dev/null
@@ -1,19 +0,0 @@ 
-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 @@
- CFLAGS = @CFLAGS@
- 
- # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
--INTERNAL_CFLAGS_BASE =  ${CFLAGS} ${GLOBAL_CFLAGS} \
-+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}
- 
- # LDFLAGS is specifically reserved for setting from the command line
- # when running make.
diff --git a/meta/recipes-devtools/gdb/gdb_7.5.1.bb b/meta/recipes-devtools/gdb/gdb_7.6.bb
similarity index 94%
rename from meta/recipes-devtools/gdb/gdb_7.5.1.bb
rename to meta/recipes-devtools/gdb/gdb_7.6.bb
index 0645b56..cd323f5 100644
--- a/meta/recipes-devtools/gdb/gdb_7.5.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.6.bb
@@ -4,6 +4,5 @@  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}"