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

Antonio Ospite ospite at studenti.unina.it
Wed Dec 7 15:18:11 UTC 2011


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 at 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 at linaro.org>
-
- 	gcc/
- 	Backport from mainline:
- 
-	2011-08-18  Richard Sandiford  <richard.sandiford at 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





More information about the Openembedded-devel mailing list