| Message ID | 1343909390-23651-1-git-send-email-Martin.Jansa@gmail.com |
|---|---|
| State | Accepted |
| Commit | f78044f85ab1a0acce852a7032fc0c81285cd4c1 |
| Headers | show |
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 42bdde9..a8642f0 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" do_compile () { if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then - sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk fi unset LDFLAGS
On Aug 2, 2012, at 5:09 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > * with old regexp it wasn't reentrant, causing stuff like this: > -LD = $(CROSS_COMPILE)ld > +LD = $(CROSS_COMPILE)ld.bfd.bfd > -LDR = $(CROSS_COMPILE)ldr > +LDR = $(CROSS_COMPILE)ld.bfd.bfdr > when do_compile was reexecuted, also breaking LDR variable and > http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch > when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc) > > * This patch is also better solution to ld-is-gold problem then regexp in metadata. It would be rather beneficial to import the u-boot patch to accommodate gold from meta-ti this helps in creating a uniform solution to same problem. u-boot patch should be upstreamed too. > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/recipes-bsp/u-boot/u-boot.inc | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc > index 42bdde9..a8642f0 100644 > --- a/meta/recipes-bsp/u-boot/u-boot.inc > +++ b/meta/recipes-bsp/u-boot/u-boot.inc > @@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" > > do_compile () { > if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then > - sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk > + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk > fi > > unset LDFLAGS > -- > 1.7.8.6 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Thu, Aug 02, 2012 at 07:32:02AM -0700, Khem Raj wrote: > > On Aug 2, 2012, at 5:09 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > > > * with old regexp it wasn't reentrant, causing stuff like this: > > -LD = $(CROSS_COMPILE)ld > > +LD = $(CROSS_COMPILE)ld.bfd.bfd > > -LDR = $(CROSS_COMPILE)ldr > > +LDR = $(CROSS_COMPILE)ld.bfd.bfdr > > when do_compile was reexecuted, also breaking LDR variable and > > http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch > > when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc) > > > > * This patch is also better solution to ld-is-gold problem then regexp in metadata. > > It would be rather beneficial to import the u-boot patch to accommodate gold from meta-ti > this helps in creating a uniform solution to same problem. u-boot patch should be upstreamed too. Then upstream it :) > > > > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > --- > > meta/recipes-bsp/u-boot/u-boot.inc | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc > > index 42bdde9..a8642f0 100644 > > --- a/meta/recipes-bsp/u-boot/u-boot.inc > > +++ b/meta/recipes-bsp/u-boot/u-boot.inc > > @@ -34,7 +34,7 @@ SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" > > > > do_compile () { > > if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then > > - sed -i 's/$(CROSS_COMPILE)ld/$(CROSS_COMPILE)ld.bfd/g' config.mk > > + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk > > fi > > > > unset LDFLAGS > > -- > > 1.7.8.6 > > > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Thu, Aug 2, 2012 at 11:32 AM, Khem Raj <raj.khem@gmail.com> wrote: > It would be rather beneficial to import the u-boot patch to accommodate gold from meta-ti > this helps in creating a uniform solution to same problem. u-boot patch should be upstreamed too. I'll port this patch to U-Boot master and send it for inclusion.
* with old regexp it wasn't reentrant, causing stuff like this: -LD = $(CROSS_COMPILE)ld +LD = $(CROSS_COMPILE)ld.bfd.bfd -LDR = $(CROSS_COMPILE)ldr +LDR = $(CROSS_COMPILE)ld.bfd.bfdr when do_compile was reexecuted, also breaking LDR variable and http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc) * This patch is also better solution to ld-is-gold problem then regexp in metadata. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)