* gcc-4.6 patches in meta-oe need to be rebased on new oe-core revision
@ 2011-09-29 9:28 Martin Jansa
2011-09-29 13:57 ` [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2011-09-29 9:28 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3909 bytes --]
Hi,
oe-core recipe was upgraded yesterday:
http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=ed7deecb9503420fbf8071445e077c32beda8dc4
and
ie Patch gcc-4.6-linaro-r106741.patch does not apply anymore
ERROR: Error executing a python function in /OE/shr-core/openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb:
CmdError: Command Error: exit status: 1 Output:
Applying patch gcc-4.6-linaro-r106741.patch
patching file gcc/combine.c
Hunk #2 succeeded at 3112 (offset 26 lines).
Hunk #3 succeeded at 3129 (offset 26 lines).
Hunk #4 succeeded at 3168 (offset 26 lines).
Hunk #5 succeeded at 3198 (offset 26 lines).
Hunk #6 succeeded at 3260 (offset 26 lines).
Hunk #7 succeeded at 3268 (offset 26 lines).
Hunk #8 succeeded at 4943 (offset 29 lines).
Hunk #9 succeeded at 5010 (offset 29 lines).
Hunk #10 succeeded at 5027 (offset 29 lines).
Hunk #11 succeeded at 5073 (offset 29 lines).
Hunk #12 succeeded at 5151 (offset 29 lines).
Hunk #13 succeeded at 5210 (offset 29 lines).
Hunk #14 succeeded at 5230 (offset 29 lines).
Hunk #15 succeeded at 5290 (offset 29 lines).
Hunk #16 FAILED at 5606.
| NOTE: Applying patch 'gcc-4.6-linaro-r106720.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106720.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106723.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106723.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106729.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106729.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106733.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106733.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106737.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106737.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106738.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106738.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106739.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106739.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106740.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106740.patch)
| NOTE: Applying patch 'gcc-4.6-linaro-r106741.patch' (meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch)
| ERROR: Error executing a python function in /OE/shr-core/openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb:
| CmdError: Command Error: exit status: 1 Output:
| Applying patch gcc-4.6-linaro-r106741.patch
| patching file gcc/combine.c
| Hunk #2 succeeded at 3112 (offset 26 lines).
| Hunk #3 succeeded at 3129 (offset 26 lines).
| Hunk #4 succeeded at 3168 (offset 26 lines).
| Hunk #5 succeeded at 3198 (offset 26 lines).
| Hunk #6 succeeded at 3260 (offset 26 lines).
| Hunk #7 succeeded at 3268 (offset 26 lines).
| Hunk #8 succeeded at 4943 (offset 29 lines).
| Hunk #9 succeeded at 5010 (offset 29 lines).
| Hunk #10 succeeded at 5027 (offset 29 lines).
| Hunk #11 succeeded at 5073 (offset 29 lines).
| Hunk #12 succeeded at 5151 (offset 29 lines).
| Hunk #13 succeeded at 5210 (offset 29 lines).
| Hunk #14 succeeded at 5230 (offset 29 lines).
| Hunk #15 succeeded at 5290 (offset 29 lines).
| Hunk #16 FAILED at 5606.
| Hunk #17 succeeded at 5728 (offset 29 lines).
| Hunk #18 succeeded at 5783 (offset 29 lines).
| Hunk #19 succeeded at 5984 (offset 29 lines).
| Hunk #20 succeeded at 6205 (offset 29 lines).
| 1 out of 20 hunks FAILED -- rejects in file gcc/combine.c
| Patch gcc-4.6-linaro-r106741.patch does not apply (enforce with -f)
I've pinged khem on IRC yesterday.. but posting also here just for record.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc
2011-09-29 9:28 gcc-4.6 patches in meta-oe need to be rebased on new oe-core revision Martin Jansa
@ 2011-09-29 13:57 ` Martin Jansa
2011-09-29 14:18 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2011-09-29 13:57 UTC (permalink / raw)
To: openembedded-devel
* they need to be rebased after
http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=ed7deecb9503420fbf8071445e077c32beda8dc4
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch | 4 ++--
.../gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch | 9 ++++-----
.../gcc/gcc-4_6-branch-linaro-backports.inc | 2 --
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
index 84f6f64..f76914f 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
@@ -188,8 +188,8 @@
{
/* Try to simplify the expression further. */
rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
-- temp = combine_simplify_rtx (tor, mode, in_dest);
-+ temp = combine_simplify_rtx (tor, mode, in_dest, 0);
+- temp = combine_simplify_rtx (tor, VOIDmode, in_dest);
++ temp = combine_simplify_rtx (tor, VOIDmode, in_dest, 0);
/* If we could, great. If not, do not go ahead with the IOR
replacement, since PLUS appears in many special purpose
diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
index d14f06c..836b76f 100644
--- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
+++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
@@ -1582,15 +1582,14 @@
=== modified file 'gcc/config/arm/predicates.md'
--- old/gcc/config/arm/predicates.md 2011-04-07 10:52:12 +0000
+++ new/gcc/config/arm/predicates.md 2011-05-03 15:14:56 +0000
-@@ -683,3 +683,7 @@
- }
- return true;
- })
+@@ -686,3 +686,7 @@
+
+ (define_special_predicate "add_operator"
+ (match_code "plus"))
+
+(define_special_predicate "neon_struct_operand"
+ (and (match_code "mem")
+ (match_test "TARGET_32BIT && neon_vector_mem_operand (op, 2)")))
-
=== modified file 'gcc/doc/tm.texi'
--- old/gcc/doc/tm.texi 2011-01-22 19:35:10 +0000
+++ new/gcc/doc/tm.texi 2011-05-03 15:17:25 +0000
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 86dceab..e256e15 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
@@ -21,11 +21,9 @@ file://linaro/gcc-4.6-linaro-r106755.patch \
file://linaro/gcc-4.6-linaro-r106759.patch \
file://linaro/gcc-4.6-linaro-r106761.patch \
file://linaro/gcc-4.6-linaro-r106762.patch \
-file://linaro/gcc-4.6-linaro-r106763.patch \
file://linaro/gcc-4.6-linaro-r106764.patch \
file://linaro/gcc-4.6-linaro-r106766.patch \
file://linaro/gcc-4.6-linaro-r106768.patch \
-file://linaro/gcc-4.6-linaro-r106769.patch \
file://linaro/gcc-4.6-linaro-r106770.patch \
file://linaro/gcc-4.6-linaro-r106771.patch \
file://linaro/gcc-4.6-linaro-r106772.patch \
--
1.7.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc
2011-09-29 13:57 ` [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc Martin Jansa
@ 2011-09-29 14:18 ` Khem Raj
2011-09-29 14:26 ` Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Khem Raj @ 2011-09-29 14:18 UTC (permalink / raw)
To: openembedded-devel
On Thu, Sep 29, 2011 at 6:57 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * they need to be rebased after
> http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=ed7deecb9503420fbf8071445e077c32beda8dc4
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
I had a patch which should have addressed it. I was waiting for update in core
can you try this one out ? this should address this issue as well.
http://patches.openembedded.org/patch/12407/
> ---
> .../gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch | 4 ++--
> .../gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch | 9 ++++-----
> .../gcc/gcc-4_6-branch-linaro-backports.inc | 2 --
> 3 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
> index 84f6f64..f76914f 100644
> --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
> +++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
> @@ -188,8 +188,8 @@
> {
> /* Try to simplify the expression further. */
> rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
> -- temp = combine_simplify_rtx (tor, mode, in_dest);
> -+ temp = combine_simplify_rtx (tor, mode, in_dest, 0);
> +- temp = combine_simplify_rtx (tor, VOIDmode, in_dest);
> ++ temp = combine_simplify_rtx (tor, VOIDmode, in_dest, 0);
>
> /* If we could, great. If not, do not go ahead with the IOR
> replacement, since PLUS appears in many special purpose
> diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
> index d14f06c..836b76f 100644
> --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
> +++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
> @@ -1582,15 +1582,14 @@
> === modified file 'gcc/config/arm/predicates.md'
> --- old/gcc/config/arm/predicates.md 2011-04-07 10:52:12 +0000
> +++ new/gcc/config/arm/predicates.md 2011-05-03 15:14:56 +0000
> -@@ -683,3 +683,7 @@
> - }
> - return true;
> - })
> +@@ -686,3 +686,7 @@
> +
> + (define_special_predicate "add_operator"
> + (match_code "plus"))
> +
> +(define_special_predicate "neon_struct_operand"
> + (and (match_code "mem")
> + (match_test "TARGET_32BIT && neon_vector_mem_operand (op, 2)")))
> -
> === modified file 'gcc/doc/tm.texi'
> --- old/gcc/doc/tm.texi 2011-01-22 19:35:10 +0000
> +++ new/gcc/doc/tm.texi 2011-05-03 15:17:25 +0000
> 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 86dceab..e256e15 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
> @@ -21,11 +21,9 @@ file://linaro/gcc-4.6-linaro-r106755.patch \
> file://linaro/gcc-4.6-linaro-r106759.patch \
> file://linaro/gcc-4.6-linaro-r106761.patch \
> file://linaro/gcc-4.6-linaro-r106762.patch \
> -file://linaro/gcc-4.6-linaro-r106763.patch \
> file://linaro/gcc-4.6-linaro-r106764.patch \
> file://linaro/gcc-4.6-linaro-r106766.patch \
> file://linaro/gcc-4.6-linaro-r106768.patch \
> -file://linaro/gcc-4.6-linaro-r106769.patch \
> file://linaro/gcc-4.6-linaro-r106770.patch \
> file://linaro/gcc-4.6-linaro-r106771.patch \
> file://linaro/gcc-4.6-linaro-r106772.patch \
> --
> 1.7.6.1
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc
2011-09-29 14:18 ` Khem Raj
@ 2011-09-29 14:26 ` Martin Jansa
2011-10-03 19:13 ` Khem Raj
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2011-09-29 14:26 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4723 bytes --]
On Thu, Sep 29, 2011 at 07:18:15AM -0700, Khem Raj wrote:
> On Thu, Sep 29, 2011 at 6:57 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > * they need to be rebased after
> > http://git.openembedded.org/cgit.cgi/openembedded-core/commit/?id=ed7deecb9503420fbf8071445e077c32beda8dc4
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> I had a patch which should have addressed it. I was waiting for update in core
> can you try this one out ? this should address this issue as well.
>
> http://patches.openembedded.org/patch/12407/
Thanks, I'll try your patch.. not sure why I haven't seen it on ML (or
was it sent just now? - if yes, can you please send such patch at the
same time as patch for oe-core? so people willing to test it can do it
before applying oe-core patch?).
Regards,
>
> > ---
> > .../gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch | 4 ++--
> > .../gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch | 9 ++++-----
> > .../gcc/gcc-4_6-branch-linaro-backports.inc | 2 --
> > 3 files changed, 6 insertions(+), 9 deletions(-)
> >
> > diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
> > index 84f6f64..f76914f 100644
> > --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
> > +++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106741.patch
> > @@ -188,8 +188,8 @@
> > {
> > /* Try to simplify the expression further. */
> > rtx tor = simplify_gen_binary (IOR, mode, XEXP (x, 0), XEXP (x, 1));
> > -- temp = combine_simplify_rtx (tor, mode, in_dest);
> > -+ temp = combine_simplify_rtx (tor, mode, in_dest, 0);
> > +- temp = combine_simplify_rtx (tor, VOIDmode, in_dest);
> > ++ temp = combine_simplify_rtx (tor, VOIDmode, in_dest, 0);
> >
> > /* If we could, great. If not, do not go ahead with the IOR
> > replacement, since PLUS appears in many special purpose
> > diff --git a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
> > index d14f06c..836b76f 100644
> > --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
> > +++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106742.patch
> > @@ -1582,15 +1582,14 @@
> > === modified file 'gcc/config/arm/predicates.md'
> > --- old/gcc/config/arm/predicates.md 2011-04-07 10:52:12 +0000
> > +++ new/gcc/config/arm/predicates.md 2011-05-03 15:14:56 +0000
> > -@@ -683,3 +683,7 @@
> > - }
> > - return true;
> > - })
> > +@@ -686,3 +686,7 @@
> > +
> > + (define_special_predicate "add_operator"
> > + (match_code "plus"))
> > +
> > +(define_special_predicate "neon_struct_operand"
> > + (and (match_code "mem")
> > + (match_test "TARGET_32BIT && neon_vector_mem_operand (op, 2)")))
> > -
> > === modified file 'gcc/doc/tm.texi'
> > --- old/gcc/doc/tm.texi 2011-01-22 19:35:10 +0000
> > +++ new/gcc/doc/tm.texi 2011-05-03 15:17:25 +0000
> > 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 86dceab..e256e15 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
> > @@ -21,11 +21,9 @@ file://linaro/gcc-4.6-linaro-r106755.patch \
> > file://linaro/gcc-4.6-linaro-r106759.patch \
> > file://linaro/gcc-4.6-linaro-r106761.patch \
> > file://linaro/gcc-4.6-linaro-r106762.patch \
> > -file://linaro/gcc-4.6-linaro-r106763.patch \
> > file://linaro/gcc-4.6-linaro-r106764.patch \
> > file://linaro/gcc-4.6-linaro-r106766.patch \
> > file://linaro/gcc-4.6-linaro-r106768.patch \
> > -file://linaro/gcc-4.6-linaro-r106769.patch \
> > file://linaro/gcc-4.6-linaro-r106770.patch \
> > file://linaro/gcc-4.6-linaro-r106771.patch \
> > file://linaro/gcc-4.6-linaro-r106772.patch \
> > --
> > 1.7.6.1
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> >
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc
2011-09-29 14:26 ` Martin Jansa
@ 2011-10-03 19:13 ` Khem Raj
0 siblings, 0 replies; 5+ messages in thread
From: Khem Raj @ 2011-10-03 19:13 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Jansa
On 9/29/2011 7:26 AM, Martin Jansa wrote:
> Thanks, I'll try your patch.. not sure why I haven't seen it on ML (or
> was it sent just now? - if yes, can you please send such patch at the
> same time as patch for oe-core? so people willing to test it can do it
> before applying oe-core patch?).
I serialised it. Since it could have confused more.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-03 19:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-29 9:28 gcc-4.6 patches in meta-oe need to be rebased on new oe-core revision Martin Jansa
2011-09-29 13:57 ` [PATCH] gcc-4.6: drop/update few patches from gcc-4_6-branch-linaro-backports.inc Martin Jansa
2011-09-29 14:18 ` Khem Raj
2011-09-29 14:26 ` Martin Jansa
2011-10-03 19:13 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.