Patchwork [oe-core] gcc-4.6.inc: remove gcc-arm-set-cost.patch merged upstream

login
register
mail settings
Submitter Antonio Ospite
Date Dec. 7, 2011, 3:18 p.m.
Message ID <1323271091-8549-1-git-send-email-ospite@studenti.unina.it>
Download mbox | patch
Permalink /patch/16385/
State Not Applicable
Headers show

Comments

Antonio Ospite - Dec. 7, 2011, 3:18 p.m.
gcc-arm-set-cost.patch is not needed anymore as it has been merged
upstream, remove it.

Having it around breaks compilation with messages like:

.../gcc-4.6.2+svnr181430-r22/gcc-4_6-branch/gcc/config/arm/arm.c:7945:5: error: duplicate case value

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
---

Hi,

please review this one with extra care ;)

Thanks,
   Antonio Ospite
   http://ao2.it

 meta/recipes-devtools/gcc/gcc-4.6.inc              |    3 +-
 .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |   34 --------------------
 2 files changed, 1 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
Martin Jansa - Dec. 7, 2011, 3:34 p.m.
On Wed, Dec 07, 2011 at 04:18:11PM +0100, Antonio Ospite wrote:
> gcc-arm-set-cost.patch is not needed anymore as it has been merged
> upstream, remove it.

I belive this is because you're using meta-oe from where this patch was
moved to oe-core and it wasn't removed from meta-oe at the same time when 
it was applied in oe-core.

So right fix is to update your meta-oe checkout
http://git.openembedded.org/meta-openembedded/commit/?id=9e0a23fcb4e2c0c57de5e7b0ee8ed253b11d15b8

Regards,
 
> Having it around breaks compilation with messages like:
> 
> .../gcc-4.6.2+svnr181430-r22/gcc-4_6-branch/gcc/config/arm/arm.c:7945:5: error: duplicate case value
> 
> Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
> ---
> 
> Hi,
> 
> please review this one with extra care ;)
> 
> Thanks,
>    Antonio Ospite
>    http://ao2.it
> 
>  meta/recipes-devtools/gcc/gcc-4.6.inc              |    3 +-
>  .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |   34 --------------------
>  2 files changed, 1 insertions(+), 36 deletions(-)
>  delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
> index 18e0536..e6a9b1a 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.6.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
> @@ -1,6 +1,6 @@
>  require gcc-common.inc
>  
> -PR = "r19"
> +PR = "r20"
>  
>  # Third digit in PV should be incremented after a minor release
>  # happens from this branch on gcc e.g. currently its 4.6.0
> @@ -72,7 +72,6 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
>  	   file://pr46934.patch \
>  	   file://pr32219.patch \
>  	   file://pr47551.patch \
> -	   file://gcc-arm-set-cost.patch \
>  	  "
>  
>  SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
> diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
> deleted file mode 100644
> index 04dabaf..0000000
> --- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -2011-08-18  Richard Sandiford  <richard.sandiford@linaro.org>
> -
> - 	gcc/
> - 	Backport from mainline:
> - 
> -	2011-08-18  Richard Sandiford  <richard.sandiford@linaro.org>
> -
> -	* config/arm/arm.c (arm_rtx_costs_1): Don't modify the costs of SET.
> -	(arm_size_rtx_costs): Likewise.
> -
> -=== modified file 'gcc/config/arm/arm.c'
> ---- old/gcc/config/arm/arm.c	2011-08-12 08:08:31 +0000
> -+++ new/gcc/config/arm/arm.c	2011-08-18 13:53:37 +0000
> -@@ -7464,6 +7464,9 @@
> - 	*total = COSTS_N_INSNS (4);
> -       return true;
> - 
> -+    case SET:
> -+      return false;
> -+
> -     default:
> -       *total = COSTS_N_INSNS (4);
> -       return false;
> -@@ -7811,6 +7814,9 @@
> -       *total = COSTS_N_INSNS (1) + 1;
> -       return true;
> - 
> -+    case SET:
> -+      return false;
> -+
> -     default:
> -       if (mode != VOIDmode)
> - 	*total = COSTS_N_INSNS (ARM_NUM_REGS (mode));
> -
> -- 
> 1.7.7.3
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Antonio Ospite - Dec. 8, 2011, 10:12 a.m.
On Wed, 7 Dec 2011 16:34:53 +0100
Martin Jansa <martin.jansa@gmail.com> wrote:

> On Wed, Dec 07, 2011 at 04:18:11PM +0100, Antonio Ospite wrote:
> > gcc-arm-set-cost.patch is not needed anymore as it has been merged
> > upstream, remove it.
> 
> I belive this is because you're using meta-oe from where this patch was
> moved to oe-core and it wasn't removed from meta-oe at the same time when 
> it was applied in oe-core.
>

I see, I wrongly assumed the change was upstream but meta-oe was
applying it on top of the one from oe-core (or the other way around?),
I did not "think in layers", sorry.

> So right fix is to update your meta-oe checkout
> http://git.openembedded.org/meta-openembedded/commit/?id=9e0a23fcb4e2c0c57de5e7b0ee8ed253b11d15b8
> 

OK thanks, I updated and I am rebuilding from scratch now.

Regards,
   Antonio

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 18e0536..e6a9b1a 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@ 
 require gcc-common.inc
 
-PR = "r19"
+PR = "r20"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.6.0
@@ -72,7 +72,6 @@  SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
 	   file://pr46934.patch \
 	   file://pr32219.patch \
 	   file://pr47551.patch \
-	   file://gcc-arm-set-cost.patch \
 	  "
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
deleted file mode 100644
index 04dabaf..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-2011-08-18  Richard Sandiford  <richard.sandiford@linaro.org>
-
- 	gcc/
- 	Backport from mainline:
- 
-	2011-08-18  Richard Sandiford  <richard.sandiford@linaro.org>
-
-	* config/arm/arm.c (arm_rtx_costs_1): Don't modify the costs of SET.
-	(arm_size_rtx_costs): Likewise.
-
-=== modified file 'gcc/config/arm/arm.c'
---- old/gcc/config/arm/arm.c	2011-08-12 08:08:31 +0000
-+++ new/gcc/config/arm/arm.c	2011-08-18 13:53:37 +0000
-@@ -7464,6 +7464,9 @@
- 	*total = COSTS_N_INSNS (4);
-       return true;
- 
-+    case SET:
-+      return false;
-+
-     default:
-       *total = COSTS_N_INSNS (4);
-       return false;
-@@ -7811,6 +7814,9 @@
-       *total = COSTS_N_INSNS (1) + 1;
-       return true;
- 
-+    case SET:
-+      return false;
-+
-     default:
-       if (mode != VOIDmode)
- 	*total = COSTS_N_INSNS (ARM_NUM_REGS (mode));
-