| Message ID | ZNCiPEKIjPhDgxLN@waldemar-brodkorb.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | package/elf2flt: handle more relocations | expand |
Hello, On Mon, 7 Aug 2023 09:50:20 +0200 Waldemar Brodkorb <wbx@openadk.org> wrote: > Fixes following autobuild failure: > http://autobuild.buildroot.net/results/c16/c161f191d85f9d064626ee6fcfebea61d916e434/ > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > --- > ...e-relocations-required-to-be-handled.patch | 39 +++++++++++++++++++ > 1 file changed, 39 insertions(+) > create mode 100644 package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch > > diff --git a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch > new file mode 100644 > index 0000000000..c619a1d068 > --- /dev/null > +++ b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch > @@ -0,0 +1,39 @@ > +From 5acfed0012f2fff9801b25403bd8a5e1c2ccfea2 Mon Sep 17 00:00:00 2001 > +From: Waldemar Brodkorb <wbx@openadk.org> > +Date: Mon, 7 Aug 2023 09:30:34 +0200 > +Subject: [PATCH 8/8] riscv64: add more relocations required to be handled > + > +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Thanks for the patch. However, it will raise at least two warnings from "make check-package": (1) Because it has 8/8, but we don't want such numbering in Buildroot patches (2) Because it lacks an Upstream: tag Could you address those details? Especially the Upstream: tag means we expect this patch to have been submitted upstream. Thanks! Thomas
Hi Thomas, Thomas Petazzoni wrote, > Hello, > > On Mon, 7 Aug 2023 09:50:20 +0200 > Waldemar Brodkorb <wbx@openadk.org> wrote: > > > Fixes following autobuild failure: > > http://autobuild.buildroot.net/results/c16/c161f191d85f9d064626ee6fcfebea61d916e434/ > > > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > > --- > > ...e-relocations-required-to-be-handled.patch | 39 +++++++++++++++++++ > > 1 file changed, 39 insertions(+) > > create mode 100644 package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch > > > > diff --git a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch > > new file mode 100644 > > index 0000000000..c619a1d068 > > --- /dev/null > > +++ b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch > > @@ -0,0 +1,39 @@ > > +From 5acfed0012f2fff9801b25403bd8a5e1c2ccfea2 Mon Sep 17 00:00:00 2001 > > +From: Waldemar Brodkorb <wbx@openadk.org> > > +Date: Mon, 7 Aug 2023 09:30:34 +0200 > > +Subject: [PATCH 8/8] riscv64: add more relocations required to be handled > > + > > +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > > Thanks for the patch. However, it will raise at least two warnings from > "make check-package": > > (1) Because it has 8/8, but we don't want such numbering in Buildroot patches > > (2) Because it lacks an Upstream: tag > > Could you address those details? Especially the Upstream: tag means we > expect this patch to have been submitted upstream. The problem with upstreaming the patch is, that it depends on not yet included patches for riscv64 noMMU. How should I proceed here? best regards Waldemar
On Mon, 7 Aug 2023 10:42:40 +0200 Waldemar Brodkorb <wbx@openadk.org> wrote: > The problem with upstreaming the patch is, that it depends on not > yet included patches for riscv64 noMMU. How should I proceed here? Ah, yes you're based on top of the patches in https://github.com/uclinux-dev/elf2flt/pull/22 or perhaps https://github.com/uclinux-dev/elf2flt/pull/24 ? I guess what can be done is: (1) Comment on those pull requests with this extra patch directly in the comment (2) Upstream: <link to that comment> Thanks! Thomas
diff --git a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch new file mode 100644 index 0000000000..c619a1d068 --- /dev/null +++ b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch @@ -0,0 +1,39 @@ +From 5acfed0012f2fff9801b25403bd8a5e1c2ccfea2 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <wbx@openadk.org> +Date: Mon, 7 Aug 2023 09:30:34 +0200 +Subject: [PATCH 8/8] riscv64: add more relocations required to be handled + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> +--- + elf2flt.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/elf2flt.c b/elf2flt.c +index 6685bff..6b3bea4 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -850,11 +850,21 @@ output_relocs ( + default: + goto bad_resolved_reloc; + #elif defined(TARGET_riscv64) ++ case R_RISCV_NONE: + case R_RISCV_32_PCREL: ++ case R_RISCV_ADD8: ++ case R_RISCV_ADD16: + case R_RISCV_ADD32: + case R_RISCV_ADD64: ++ case R_RISCV_SUB6: ++ case R_RISCV_SUB8: ++ case R_RISCV_SUB16: + case R_RISCV_SUB32: + case R_RISCV_SUB64: ++ case R_RISCV_SET6: ++ case R_RISCV_SET8: ++ case R_RISCV_SET16: ++ case R_RISCV_SET32: + continue; + case R_RISCV_32: + case R_RISCV_64: +-- +2.39.2 +
Fixes following autobuild failure: http://autobuild.buildroot.net/results/c16/c161f191d85f9d064626ee6fcfebea61d916e434/ Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- ...e-relocations-required-to-be-handled.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch