Re: [PATCH V6] efivar: fix unknown option while gold linker used

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3565 bytes --]

On Tue, May 17, 2016 at 11:28:32PM +0800, Hongxu Jia wrote:
> Ping Martin,
> 
> Could you apply the V6? It should be ok with gold linker

I think it's already in master-next and will be merged after next round
of world builds.

> //Hongxu
> 
> On 05/11/2016 09:39 AM, Hongxu Jia wrote:
> > - Use '-fPIC' to replace 'PIC';
> >
> > - Use 'pie' to replace 'PIE'
> >
> > - Remove unknown '--add-needed'
> >
> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> > ---
> >   .../0004-fix-unknow-option-for-gold-linker.patch   | 38 ++++++++++++++++++++++
> >   meta-oe/recipes-extended/efivar/efivar_0.23.bb     |  1 +
> >   2 files changed, 39 insertions(+)
> >   create mode 100644 meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch
> >
> > diff --git a/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch
> > new file mode 100644
> > index 0000000..5d50c19
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch
> > @@ -0,0 +1,38 @@
> > +From b3d35e7dd27a755df5acbe050837885914dbb28b Mon Sep 17 00:00:00 2001
> > +From: Hongxu Jia <hongxu.jia@windriver.com>
> > +Date: Tue, 10 May 2016 11:34:50 -0400
> > +Subject: [PATCH]  fix unknow option for gold linker
> > +
> > +- Revert the following patch, since oe-core work with gcc 5
> > +...
> > +commit 3055a3797f16693dfdd855fa68bc57fd900dc408
> > +Author: Peter Jones <pjones@redhat.com>
> > +Date:   Mon Feb 15 14:15:40 2016 -0500
> > +
> > +    Make gcc.specs work with gcc 6 / binutils 2.26
> > +
> > +    Apparently binutils 2.26 gets real picky about "ld -PIC" vs "ld -fPIC".
> > +
> > +    Signed-off-by: Peter Jones <pjones@redhat.com>
> > +...
> > +
> > +- Remove unknown option '--add-needed'
> > +
> > +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> > +---
> > + gcc.specs | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/gcc.specs b/gcc.specs
> > +index 24fabc2..5b0fdef 100644
> > +--- a/gcc.specs
> > ++++ b/gcc.specs
> > +@@ -14,4 +14,4 @@
> > + + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now}
> > +
> > + *link:
> > +-+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-PIE}} %{shared:-z relro -PIC} %{static:%<pie}
> > +++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro -fPIC} %{static:%<pie}
> > +--
> > +2.8.1
> > +
> > diff --git a/meta-oe/recipes-extended/efivar/efivar_0.23.bb b/meta-oe/recipes-extended/efivar/efivar_0.23.bb
> > index 9c47461..6e9a51f 100644
> > --- a/meta-oe/recipes-extended/efivar/efivar_0.23.bb
> > +++ b/meta-oe/recipes-extended/efivar/efivar_0.23.bb
> > @@ -12,6 +12,7 @@ SRC_URI = "git://github.com/rhinstaller/efivar.git"
> >   SRC_URI_append_class-target = " file://0001-efivar-fix-for-cross-compile.patch \
> >                                   file://0002-disable-static-build.patch \
> >                                   file://0003-efivar-fix-for-cross-compile.patch \
> > +                                file://0004-fix-unknow-option-for-gold-linker.patch \
> >                                 "
> >   
> >   S = "${WORKDIR}/git"
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]