Patchwork [[meta-oe] 1/2] gcc-4.6: Delete the patch that is now applied in oe-core

login
register
mail settings
Submitter Khem Raj
Date Dec. 6, 2011, 5:24 a.m.
Message ID <1323149076-10389-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/16207/
State Accepted
Commit 9e0a23fcb4e2c0c57de5e7b0ee8ed253b11d15b8
Headers show

Comments

Khem Raj - Dec. 6, 2011, 5:24 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch    |   34 --------------------
 .../gcc/gcc-4_6-branch-linaro-backports.inc        |    1 -
 2 files changed, 0 insertions(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch
Khem Raj - Dec. 6, 2011, 6:11 p.m.
Hi Koen

The corresponding patch to oe-core is now applied. Now you can apply
this to meta-oe
otherwise people may start seeing conflicts.

Thanks
-Khem

On Mon, Dec 5, 2011 at 9:24 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch    |   34 --------------------
>  .../gcc/gcc-4_6-branch-linaro-backports.inc        |    1 -
>  2 files changed, 0 insertions(+), 35 deletions(-)
>  delete mode 100644 meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch
>
> diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch
> deleted file mode 100644
> index 04dabaf..0000000
> --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.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));
> -
> diff --git a/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc b/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
> index fcdccf5..882876e 100644
> --- a/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
> +++ b/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
> @@ -39,7 +39,6 @@ file://linaro/gcc-4.6-linaro-r106786.patch \
>  file://linaro/gcc-4.6-linaro-r106787.patch \
>  file://linaro/gcc-4.6-linaro-r106789.patch \
>  file://linaro/gcc-4.6-linaro-r106792.patch \
> -file://linaro/gcc-4.6-linaro-r106793.patch \
>  file://linaro/gcc-4.6-linaro-r106794.patch \
>  file://linaro/gcc-4.6-linaro-r106796.patch \
>  file://linaro/gcc-4.6-linaro-r106797.patch \
> --
> 1.7.5.4
>

Patch

diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.patch
deleted file mode 100644
index 04dabaf..0000000
--- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106793.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));
-
diff --git a/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc b/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
index fcdccf5..882876e 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
+++ b/meta-oe/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc
@@ -39,7 +39,6 @@  file://linaro/gcc-4.6-linaro-r106786.patch \
 file://linaro/gcc-4.6-linaro-r106787.patch \
 file://linaro/gcc-4.6-linaro-r106789.patch \
 file://linaro/gcc-4.6-linaro-r106792.patch \
-file://linaro/gcc-4.6-linaro-r106793.patch \
 file://linaro/gcc-4.6-linaro-r106794.patch \
 file://linaro/gcc-4.6-linaro-r106796.patch \
 file://linaro/gcc-4.6-linaro-r106797.patch \